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

Commit 1210f2ab authored by Wengang Wu's avatar Wengang Wu Committed by Android Git Automerger
Browse files

am 20071e50: am e3d37a7b: Enable support RGBX_8888 for omap3 

* commit '20071e50':
  Enable support RGBX_8888 for omap3
parents 14be6fa6 20071e50

services/surfaceflinger/Android.mk

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

services/surfaceflinger/SurfaceFlinger.cpp

+0 −12
Original line number Original line Diff line number Diff line
@@ -2002,19 +2002,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) {
@@ -2345,9 +2336,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