diff options
| author | Wengang Wu <wgw@motorola.com> | 2014-06-06 16:32:15 -0500 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2014-06-11 11:13:40 -0700 |
| commit | e3d37a7b55f86f5d005dd67f828dcf51fe60c0f6 (patch) | |
| tree | 7df294d24a4bbae6de88883862382ef13610f6aa /services | |
| parent | 90654afb3aeac78916f2a53fe689a087c0e283c9 (diff) | |
| download | frameworks_native-e3d37a7b55f86f5d005dd67f828dcf51fe60c0f6.zip frameworks_native-e3d37a7b55f86f5d005dd67f828dcf51fe60c0f6.tar.gz frameworks_native-e3d37a7b55f86f5d005dd67f828dcf51fe60c0f6.tar.bz2 | |
Enable support RGBX_8888 for omap3
Bug: 14995811
Change-Id: Iaeb5a5ad0e3bcf215613f24f2570ae0d8267c016
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/Android.mk | 3 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index b2bc550..afa680f 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 b1db870..08cc506 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1955,19 +1955,10 @@ status_t SurfaceFlinger::createNormalLayer(const sp<Client>& 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 |