From e3d37a7b55f86f5d005dd67f828dcf51fe60c0f6 Mon Sep 17 00:00:00 2001 From: Wengang Wu Date: Fri, 6 Jun 2014 16:32:15 -0500 Subject: [PATCH] Enable support RGBX_8888 for omap3 Bug: 14995811 Change-Id: Iaeb5a5ad0e3bcf215613f24f2570ae0d8267c016 --- services/surfaceflinger/Android.mk | 3 --- services/surfaceflinger/SurfaceFlinger.cpp | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index b2bc550c9..afa680f0c 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -37,9 +37,6 @@ LOCAL_SRC_FILES:= \ LOCAL_CFLAGS:= -DLOG_TAG=\"SurfaceFlinger\" LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -ifeq ($(TARGET_BOARD_PLATFORM),omap3) - LOCAL_CFLAGS += -DNO_RGBX_8888 -endif ifeq ($(TARGET_BOARD_PLATFORM),omap4) LOCAL_CFLAGS += -DHAS_CONTEXT_PRIORITY endif diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index b1db8702d..08cc50636 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1955,19 +1955,10 @@ status_t SurfaceFlinger::createNormalLayer(const sp& client, format = PIXEL_FORMAT_RGBA_8888; break; case PIXEL_FORMAT_OPAQUE: -#ifdef NO_RGBX_8888 - format = PIXEL_FORMAT_RGB_565; -#else format = PIXEL_FORMAT_RGBX_8888; -#endif 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); status_t err = (*outLayer)->setBuffers(w, h, format, flags); if (err == NO_ERROR) { @@ -2298,9 +2289,6 @@ void SurfaceFlinger::logFrameStats() { { static const char* config = " [sf" -#ifdef NO_RGBX_8888 - " NO_RGBX_8888" -#endif #ifdef HAS_CONTEXT_PRIORITY " HAS_CONTEXT_PRIORITY" #endif