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

Commit 3ce4ffc4 authored by Christopher N. Hesse's avatar Christopher N. Hesse Committed by Ethan Chen
Browse files

surfaceflinger: Add support for Exynos BGRA mixer 

Change-Id: Ibc9f784b35a7bd6d8cc6b13ff68b12418cce98c5
parent ec0faee3

opengl/libs/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ ifneq ($(MAX_EGL_CACHE_SIZE),) 
  LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE)

endif



ifeq ($(BOARD_USE_BGRA_8888), true)

  LOCAL_CFLAGS += -DUSE_BGRA_8888

endif



LOCAL_REQUIRED_MODULES := $(egl.cfg_config_module)

egl.cfg_config_module :=

opengl/libs/EGL/eglApi.cpp

+9 −0
Original line number Diff line number Diff line
@@ -462,8 +462,13 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config, 
        // modify the EGLconfig's format before setting the native window's

        // format.



#ifdef USE_BGRA_8888

        // by default, just pick BGRA_8888

        EGLint format = HAL_PIXEL_FORMAT_BGRA_8888;

#else

        // by default, just pick RGBA_8888

        EGLint format = HAL_PIXEL_FORMAT_RGBA_8888;

#endif

        android_dataspace dataSpace = HAL_DATASPACE_UNKNOWN;



#if WORKAROUND_BUG_10194508
@@ -478,7 +483,11 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config, 
        cnx->egl.eglGetConfigAttrib(iDpy, config, EGL_ALPHA_SIZE, &a);

        if (a > 0) {

            // alpha-channel requested, there's really only one suitable format

#ifdef USE_BGRA_8888

            format = HAL_PIXEL_FORMAT_BGRA_8888;

#else

            format = HAL_PIXEL_FORMAT_RGBA_8888;

#endif

        } else {

            EGLint r, g, b;

            r = g = b = 0;

services/surfaceflinger/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ else 
    LOCAL_CFLAGS += -DMAX_VIRTUAL_DISPLAY_DIMENSION=0

endif



ifeq ($(BOARD_USE_BGRA_8888),true)

    LOCAL_CFLAGS += -DUSE_BGRA_8888

endif



LOCAL_CFLAGS += -fvisibility=hidden -Werror=format

LOCAL_CFLAGS += -std=c++11

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+16 −0
Original line number Diff line number Diff line
@@ -435,7 +435,11 @@ status_t HWComposer::queryDisplayProperties(int disp) { 
    }



    // FIXME: what should we set the format to?

#ifdef USE_BGRA_8888

    mDisplayData[disp].format = HAL_PIXEL_FORMAT_BGRA_8888;

#else

    mDisplayData[disp].format = HAL_PIXEL_FORMAT_RGBA_8888;

#endif

    mDisplayData[disp].connected = true;

    return NO_ERROR;

}
@@ -497,7 +501,11 @@ sp<Fence> HWComposer::getDisplayFence(int disp) const { 


uint32_t HWComposer::getFormat(int disp) const {

    if (static_cast<uint32_t>(disp) >= MAX_HWC_DISPLAYS || !mAllocatedDisplayIDs.hasBit(disp)) {

#ifdef USE_BGRA_8888

        return HAL_PIXEL_FORMAT_BGRA_8888;

#else

        return HAL_PIXEL_FORMAT_RGBA_8888;

#endif

    } else {

        return mDisplayData[disp].format;

    }
@@ -879,7 +887,11 @@ int HWComposer::getVisualID() const { 
        // FIXME: temporary hack until HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED

        // is supported by the implementation. we can only be in this case

        // if we have HWC 1.1

#ifdef USE_BGRA_8888

        return HAL_PIXEL_FORMAT_BGRA_8888;

#else

        return HAL_PIXEL_FORMAT_RGBA_8888;

#endif

        //return HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;

    } else {

        return mFbDev->format;
@@ -1367,7 +1379,11 @@ bool HWComposer::VSyncThread::threadLoop() { 
HWComposer::DisplayData::DisplayData()

:   configs(),

    currentConfig(0),

#ifdef USE_BGRA_8888

    format(HAL_PIXEL_FORMAT_BGRA_8888),

#else

    format(HAL_PIXEL_FORMAT_RGBA_8888),

#endif

    connected(false),

    hasFbComp(false), hasOvComp(false),

    capacity(0), list(NULL),