From 07df6201eb08cb718727e3d776473c8d99f38126 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 21 Feb 2015 12:41:44 +0100 Subject: [PATCH] fbaccel: make blit() private, remove calls from fb_ng The explicit blit() calls should not be needed, let the autoblit thread handle it instead. --- src/driver/fbaccel.h | 2 +- src/driver/framebuffer_ng.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/driver/fbaccel.h b/src/driver/fbaccel.h index d40176d86..965df48c9 100644 --- a/src/driver/fbaccel.h +++ b/src/driver/fbaccel.h @@ -56,6 +56,7 @@ class CFbAccel #endif /* USE_NEVIS_GXA */ void setColor(fb_pixel_t col); void run(void); + void blit(void); void _blit(void); bool blit_thread; bool blit_pending; @@ -84,7 +85,6 @@ class CFbAccel void blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool transp); void waitForIdle(void); void mark(int x, int y, int dx, int dy); - void blit(); void update(); #ifdef USE_NEVIS_GXA void setupGXA(void); diff --git a/src/driver/framebuffer_ng.cpp b/src/driver/framebuffer_ng.cpp index 91a642174..ce64c8a97 100644 --- a/src/driver/framebuffer_ng.cpp +++ b/src/driver/framebuffer_ng.cpp @@ -785,7 +785,6 @@ bool CFrameBuffer::paintIcon8(const std::string & filename, const int x, const i } close(lfd); accel->mark(x, y, x + width, y + height); - accel->blit(); return true; } @@ -1092,7 +1091,6 @@ void CFrameBuffer::paintBackground() memmove(((uint8_t *)getFrameBufferPointer()) + i * stride, (background + i * BACKGROUNDIMAGEWIDTH), BACKGROUNDIMAGEWIDTH * sizeof(fb_pixel_t)); checkFbArea(0, 0, xRes, yRes, false); accel->mark(0, 0, xRes, yRes); - accel->blit(); } else { @@ -1143,7 +1141,6 @@ void CFrameBuffer::RestoreScreen(int x, int y, int dx, int dy, fb_pixel_t * cons bkpos += dx; } accel->mark(x, y, x + dx, y + dy); - accel->blit(); checkFbArea(x, y, dx, dy, false); }