drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fc36afcb: am f998c4a2: Merge change I1c0bebbc into eclair

Browse Source 
Merge commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6' into eclair-mr2-plus-aosp

* commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6':
  fix [2262591] Junk on screen in ERD46
This commit is contained in:
Mathias Agopian
2009-11-16 15:12:43 -08:00
committed by Android Git Automerger
parent 35d857002d fc36afcba6
commit af3e233fe3
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/surfaceflinger/Android.mk
View File

@ -22,9 +22,6 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
ifeq ($(TARGET_BOARD_PLATFORM), msm7k) ifeq ($(TARGET_BOARD_PLATFORM), msm7k)
LOCAL_CFLAGS += -DDIM_WITH_TEXTURE LOCAL_CFLAGS += -DDIM_WITH_TEXTURE
endif endif
ifeq ($(TARGET_BOARD_PLATFORM), qsd8k)
LOCAL_CFLAGS += -DDIM_WITH_TEXTURE
endif
# need "-lrt" on Linux simulator to pick up clock_gettime # need "-lrt" on Linux simulator to pick up clock_gettime
ifeq ($(TARGET_SIMULATOR),true) ifeq ($(TARGET_SIMULATOR),true)

1
libs/surfaceflinger/LayerBlur.cpp
View File

@ -169,6 +169,7 @@ void LayerBlur::onDraw(const Region& clip) const
// This reads the frame-buffer, so a h/w GL would have to // This reads the frame-buffer, so a h/w GL would have to
// finish() its rendering first. we don't want to do that // finish() its rendering first. we don't want to do that
// too often. Read data is 4-bytes aligned. // too often. Read data is 4-bytes aligned.
glFinish();
glReadPixels(X, Y, w, h, mReadFormat, mReadType, pixels); glReadPixels(X, Y, w, h, mReadFormat, mReadType, pixels);
// blur that texture. // blur that texture.