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

Commit 733a8075 authored by Alistair Strachan's avatar Alistair Strachan
Browse files

egl: Remove old tuna BGRA vs RGBA workaround. 

Some time before kitkat, a workaround was put in place to keep tuna
working with obsolete PowerVR GPU drivers. The tuna product was dropped
in AOSP for kitkat, but the workaround remained.

There are still a number of devices shipping with OMAP4 processors, and
this workaround continues to be applied on those products even when it
is not required. The effect is that virtual display CTS will fail on
those devices.
parent 8511b3ae

opengl/libs/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ LOCAL_CFLAGS += -DEGL_TRACE=1 
ifeq ($(BOARD_ALLOW_EGL_HIBERNATION),true)

  LOCAL_CFLAGS += -DBOARD_ALLOW_EGL_HIBERNATION

endif

ifeq ($(TARGET_BOARD_PLATFORM), omap4)

  LOCAL_CFLAGS += -DWORKAROUND_BUG_10194508=1

endif

ifneq ($(MAX_EGL_CACHE_ENTRY_SIZE),)

  LOCAL_CFLAGS += -DMAX_EGL_CACHE_ENTRY_SIZE=$(MAX_EGL_CACHE_ENTRY_SIZE)

endif

opengl/libs/EGL/eglApi.cpp

+2 −30
Original line number Diff line number Diff line
@@ -421,35 +421,7 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config, 
        // of our native format. So if sRGB gamma is requested, we have to

        // modify the EGLconfig's format before setting the native window's

        // format.

#if WORKAROUND_BUG_10194508

#warning "WORKAROUND_10194508 enabled"

        EGLint format;

        if (!cnx->egl.eglGetConfigAttrib(iDpy, config, EGL_NATIVE_VISUAL_ID,

                &format)) {

            ALOGE("eglGetConfigAttrib(EGL_NATIVE_VISUAL_ID) failed: %#x",

                    eglGetError());

            format = 0;

        }

        if (attrib_list) {

            for (const EGLint* attr = attrib_list; *attr != EGL_NONE;

                    attr += 2) {

                if (*attr == EGL_GL_COLORSPACE_KHR &&

                        dp->haveExtension("EGL_KHR_gl_colorspace")) {

                    if (ENABLE_EGL_KHR_GL_COLORSPACE) {

                        format = modifyFormatColorspace(format, *(attr+1));

                    } else {

                        // Normally we'd pass through unhandled attributes to

                        // the driver. But in case the driver implements this

                        // extension but we're disabling it, we want to prevent

                        // it getting through -- support will be broken without

                        // our help.

                        ALOGE("sRGB window surfaces not supported");

                        return setError(EGL_BAD_ATTRIBUTE, EGL_NO_SURFACE);

                    }

                }

            }

        }

#else



        // by default, just pick RGBA_8888

        EGLint format = HAL_PIXEL_FORMAT_RGBA_8888;
@@ -490,7 +462,7 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config, 
                }

            }

        }

#endif



        if (format != 0) {

            int err = native_window_set_buffers_format(window, format);

            if (err != 0) {