diff options
Diffstat (limited to 'libs/surfaceflinger')
-rw-r--r-- | libs/surfaceflinger/Android.mk | 3 | ||||
-rw-r--r-- | libs/surfaceflinger/LayerBlur.cpp | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libs/surfaceflinger/Android.mk b/libs/surfaceflinger/Android.mk index eb51c22..b3fed58 100644 --- a/libs/surfaceflinger/Android.mk +++ b/libs/surfaceflinger/Android.mk @@ -22,9 +22,6 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES ifeq ($(TARGET_BOARD_PLATFORM), msm7k) LOCAL_CFLAGS += -DDIM_WITH_TEXTURE endif -ifeq ($(TARGET_BOARD_PLATFORM), qsd8k) - LOCAL_CFLAGS += -DDIM_WITH_TEXTURE -endif # need "-lrt" on Linux simulator to pick up clock_gettime ifeq ($(TARGET_SIMULATOR),true) diff --git a/libs/surfaceflinger/LayerBlur.cpp b/libs/surfaceflinger/LayerBlur.cpp index 5fd7904..5d4a38b 100644 --- a/libs/surfaceflinger/LayerBlur.cpp +++ b/libs/surfaceflinger/LayerBlur.cpp @@ -169,6 +169,7 @@ void LayerBlur::onDraw(const Region& clip) const // This reads the frame-buffer, so a h/w GL would have to // finish() its rendering first. we don't want to do that // too often. Read data is 4-bytes aligned. + glFinish(); glReadPixels(X, Y, w, h, mReadFormat, mReadType, pixels); // blur that texture. |