Changeset 242875 in webkit

Timestamp:

Mar 13, 2019, 2:25:35 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r242640 - GLContextEGL: desired EGL config should search for 8-bit components by default
​https://bugs.webkit.org/show_bug.cgi?id=195413

Reviewed by Carlos Garcia Campos.

The EGL config search in GLContextEGL should by default look for
RGBA8888 configurations while allowing RGB565 as an alternative.
This prevents from accidentally landing on an RGBA1010102
configuration that is available with some graphics stacks, and which is
not expected in e.g. window snapshotting that's done for layout test
output comparison.

• platform/graphics/egl/GLContextEGL.cpp:

(WebCore::GLContextEGL::getEGLConfig): EGL config search should by
default request 8-bit color channels.

Location:

releases/WebKitGTK/webkit-2.24/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/egl/GLContextEGL.cpp (modified) (4 diffs)

releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-08  Zan Dobersek  <zdobersek@igalia.com>
+
+        GLContextEGL: desired EGL config should search for 8-bit components by default
+        https://bugs.webkit.org/show_bug.cgi?id=195413
+
+        Reviewed by Carlos Garcia Campos.
+
+        The EGL config search in GLContextEGL should by default look for
+        RGBA8888 configurations while allowing RGB565 as an alternative.
+        This prevents from accidentally landing on an RGBA1010102
+        configuration that is available with some graphics stacks, and which is
+        not expected in e.g. window snapshotting that's done for layout test
+        output comparison.
+
+        * platform/graphics/egl/GLContextEGL.cpp:
+        (WebCore::GLContextEGL::getEGLConfig): EGL config search should by
+        default request 8-bit color channels.
+
 2019-03-13  Miguel Gomez  <magomez@igalia.com>
 

releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp

@@ -97 +97 @@
 bool GLContextEGL::getEGLConfig(EGLDisplay display, EGLConfig* config, EGLSurfaceType surfaceType)
 {
+    std::array<EGLint, 4> rgbaSize = { 8, 8, 8, 8 };
+    if (const char* environmentVariable = getenv("WEBKIT_EGL_PIXEL_LAYOUT")) {
+        if (!strcmp(environmentVariable, "RGB565"))
+            rgbaSize = { 5, 6, 5, 0 };
+        else
+            WTFLogAlways("Unknown pixel layout %s, falling back to RGBA8888", environmentVariable);
+    }
+
     EGLint attributeList[] = {
 #if USE(OPENGL_ES)
@@ -103 +111 @@
         EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
 #endif
-        EGL_RED_SIZE, 1,
-        EGL_GREEN_SIZE, 1,
-        EGL_BLUE_SIZE, 1,
-        EGL_ALPHA_SIZE, 1,
+        EGL_RED_SIZE, rgbaSize[0],
+        EGL_GREEN_SIZE, rgbaSize[1],
+        EGL_BLUE_SIZE, rgbaSize[2],
+        EGL_ALPHA_SIZE, rgbaSize[3],
         EGL_STENCIL_SIZE, 8,
         EGL_SURFACE_TYPE, EGL_NONE,
         EGL_NONE
     };
-
-    bool isRGB565 = false;
-    if (const char* environmentVariable = getenv("WEBKIT_EGL_PIXEL_LAYOUT")) {
-        if (!strcmp(environmentVariable, "RGB565")) {
-            isRGB565 = true;
-            // EGL_RED_SIZE
-            attributeList[3] = 5;
-            // EGL_GREEN_SIZE
-            attributeList[5] = 6;
-            // EGL_BLUE_SIZE
-            attributeList[7] = 5;
-            // EGL_ALPHA_SIZE
-            attributeList[9] = 0;
-        } else
-            WTFLogAlways("Unknown pixel layout %s, falling back to RGBA8888", environmentVariable);
-    }
 
     switch (surfaceType) {
@@ -147 +139 @@
     EGLint numberConfigsReturned;
     Vector<EGLConfig> configs(count);
-    if (!eglChooseConfig(display, attributeList, isRGB565 ? reinterpret_cast<EGLConfig*>(configs.data()) : config, isRGB565 ? count : 1, &numberConfigsReturned) || !numberConfigsReturned)
+    if (!eglChooseConfig(display, attributeList, reinterpret_cast<EGLConfig*>(configs.data()), count, &numberConfigsReturned) || !numberConfigsReturned)
         return false;
-
-    if (!isRGB565)
-        return true;
 
     auto index = configs.findMatching([&](EGLConfig value) {
@@ -159 +148 @@
         eglGetConfigAttrib(display, value, EGL_BLUE_SIZE, &blueSize);
         eglGetConfigAttrib(display, value, EGL_ALPHA_SIZE, &alphaSize);
-        return (redSize == 5 && greenSize == 6 && blueSize == 5 && !alphaSize);
+        return redSize == rgbaSize[0] && greenSize == rgbaSize[1]
+            && blueSize == rgbaSize[2] && alphaSize == rgbaSize[3];
     });