From 0b781da031f55cdb5776fbd8bda0f71127f676c0 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 9 Aug 2017 11:36:14 +0200 Subject: [PATCH] Fix merge-error; add missing add_gxa_sync_marker() function --- src/driver/fb_generic.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/driver/fb_generic.h b/src/driver/fb_generic.h index 61c1dbd94..4b68e1e18 100644 --- a/src/driver/fb_generic.h +++ b/src/driver/fb_generic.h @@ -192,6 +192,7 @@ class CFrameBuffer : public sigc::trackable bool getActive() const; // is framebuffer active? void setActive(bool enable); // is framebuffer active? virtual void setupGXA() { return; }; // reinitialize stuff + virtual void add_gxa_sync_marker() { return; }; virtual bool needAlign4Blit() { return false; }; virtual uint32_t getWidth4FB_HW_ACC(const uint32_t x, const uint32_t w, const bool max=true);