Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9920fae7 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am f998c4a2: Merge change I1c0bebbc into eclair 

Merge commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806' into eclair-mr2

* commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806':
  fix [2262591] Junk on screen in ERD46
parents 074870af 1c84c754

libs/surfaceflinger/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -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)

libs/surfaceflinger/LayerBlur.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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.