ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c354effe: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS

Browse Source 
* commit 'c354effe97be26638618e3bc0da81a3f8b384b20':
  Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
This commit is contained in:
Jesse Hall 2013-10-25 10:52:37 -07:00 committed by Android Git Automerger
commit 96002be4bd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/surfaceflinger/Android.mk
View File

@ -51,10 +51,8 @@ ifeq ($(TARGET_DISABLE_TRIPLE_BUFFERING),true)
LOCAL_CFLAGS += -DTARGET_DISABLE_TRIPLE_BUFFERING LOCAL_CFLAGS += -DTARGET_DISABLE_TRIPLE_BUFFERING
endif endif
ifneq ($(TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS),) ifeq ($(TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS),true)
LOCAL_CFLAGS += -DFORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS=false LOCAL_CFLAGS += -DFORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS
else
LOCAL_CFLAGS += -DFORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS=true
endif endif
ifneq ($(NUM_FRAMEBUFFER_SURFACE_BUFFERS),) ifneq ($(NUM_FRAMEBUFFER_SURFACE_BUFFERS),)

6
services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
View File

@ -22,7 +22,11 @@
namespace android { namespace android {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
static bool sForceHwcCopy = FORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS; #if defined(FORCE_HWC_COPY_FOR_VIRTUAL_DISPLAYS)
static const bool sForceHwcCopy = true;
#else
static const bool sForceHwcCopy = false;
#endif
#define VDS_LOGE(msg, ...) ALOGE("[%s] "msg, \ #define VDS_LOGE(msg, ...) ALOGE("[%s] "msg, \
mDisplayName.string(), ##__VA_ARGS__) mDisplayName.string(), ##__VA_ARGS__)