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

Enable support RGBX_8888 for omap3 

Bug: 14995811
Change-Id: Iaeb5a5ad0e3bcf215613f24f2570ae0d8267c016
This commit is contained in:
Wengang Wu 2014-06-06 16:32:15 -05:00 committed by Simon Wilson
parent 90654afb3a
commit e3d37a7b55
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/surfaceflinger/Android.mk
View File

@ -37,9 +37,6 @@ LOCAL_SRC_FILES:= \
LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\"
LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
ifeq ($(TARGET_BOARD_PLATFORM),omap3)
LOCAL_CFLAGS += -DNO_RGBX_8888
endif
ifeq ($(TARGET_BOARD_PLATFORM),omap4) ifeq ($(TARGET_BOARD_PLATFORM),omap4)
LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY
endif endif

12
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -1955,19 +1955,10 @@ status_t SurfaceFlinger::createNormalLayer(const sp<Client>& client,
format = PIXEL_FORMAT_RGBA_8888; format = PIXEL_FORMAT_RGBA_8888;
break; break;
case PIXEL_FORMAT_OPAQUE: case PIXEL_FORMAT_OPAQUE:
#ifdef NO_RGBX_8888
format = PIXEL_FORMAT_RGB_565;
#else
format = PIXEL_FORMAT_RGBX_8888; format = PIXEL_FORMAT_RGBX_8888;
#endif
break; break;
} }
#ifdef NO_RGBX_8888
if (format == PIXEL_FORMAT_RGBX_8888)
format = PIXEL_FORMAT_RGBA_8888;
#endif
*outLayer = new Layer(this, client, name, w, h, flags); *outLayer = new Layer(this, client, name, w, h, flags);
status_t err = (*outLayer)->setBuffers(w, h, format, flags); status_t err = (*outLayer)->setBuffers(w, h, format, flags);
if (err == NO_ERROR) { if (err == NO_ERROR) {
@ -2298,9 +2289,6 @@ void SurfaceFlinger::logFrameStats() {
{ {
static const char* config = static const char* config =
" [sf" " [sf"
#ifdef NO_RGBX_8888
" NO_RGBX_8888"
#endif
#ifdef HAS_CONTEXT_PRIORITY #ifdef HAS_CONTEXT_PRIORITY
" HAS_CONTEXT_PRIORITY" " HAS_CONTEXT_PRIORITY"
#endif #endif