diff options
| author | Mathias Agopian <mathias@google.com> | 2009-11-17 07:33:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-17 07:33:19 -0800 |
| commit | 277c2de96975de1da236a2042d9318db254206a3 (patch) | |
| tree | 1cafeb5f62a2cae63ed7cb593c9e118e57ba34d0 | |
| parent | 04b963ad7c43e98760ddb57f703255b8a8caab59 (diff) | |
| parent | af3e233fe3222990440433d5f90a6a310d0170e3 (diff) | |
| download | frameworks_base-277c2de96975de1da236a2042d9318db254206a3.zip frameworks_base-277c2de96975de1da236a2042d9318db254206a3.tar.gz frameworks_base-277c2de96975de1da236a2042d9318db254206a3.tar.bz2 | |
am af3e233f: am fc36afcb: am f998c4a2: Merge change I1c0bebbc into eclair
Merge commit 'af3e233fe3222990440433d5f90a6a310d0170e3'
* commit 'af3e233fe3222990440433d5f90a6a310d0170e3':
fix [2262591] Junk on screen in ERD46
| -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. |