Changeset 248362 in webkit

Timestamp:

Aug 7, 2019 3:44:17 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

context-attributes-alpha-depth-stencil-antialias fails on WPE WebKit
​https://bugs.webkit.org/show_bug.cgi?id=200434

Patch by Chris Lord <Chris Lord> on 2019-08-07
Reviewed by Žan Doberšek.

This patch fixes 16-bit surfaces being used for FBOs with no
alpha component when using the GLES implementation of GraphicsContext3D.

• platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:

(WebCore::GraphicsContext3D::reshapeFBOs):
Use GL_UNSIGNED_BYTE instead of GL_UNSIGNED_SHORT_5_6_5 for surfaces with no alpha.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-07  Chris Lord  <clord@igalia.com>
+
+        context-attributes-alpha-depth-stencil-antialias fails on WPE WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=200434
+
+        Reviewed by Žan Doberšek.
+
+        This patch fixes 16-bit surfaces being used for FBOs with no
+        alpha component when using the GLES implementation of GraphicsContext3D.
+
+        * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+        (WebCore::GraphicsContext3D::reshapeFBOs):
+        Use GL_UNSIGNED_BYTE instead of GL_UNSIGNED_SHORT_5_6_5 for surfaces with no alpha.
+
 2019-08-06  Saam Barati  <sbarati@apple.com>
 

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp

@@ -80 +80 @@
     const int width = size.width();
     const int height = size.height();
-    GLuint colorFormat = 0, pixelDataType = 0;
+    GLuint colorFormat = 0;
     if (m_attrs.alpha) {
         m_internalColorFormat = GL_RGBA;
         colorFormat = GL_RGBA;
-        pixelDataType = GL_UNSIGNED_BYTE;
     } else {
         m_internalColorFormat = GL_RGB;
         colorFormat = GL_RGB;
-        pixelDataType = GL_UNSIGNED_SHORT_5_6_5;
     }
 
@@ -104 +102 @@
     ASSERT(m_texture);
     ::glBindTexture(GL_TEXTURE_2D, m_texture);
-    ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, pixelDataType, 0);
+    ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
     ::glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0);