Changeset 271062 in webkit

Timestamp:

Dec 22, 2020 12:40:46 PM (3 years ago)

Author:

commit-queue@webkit.org

Message:

[WebGL2] deqp/functional/gles3/texturespecification RGB4444 and RGB565 failures on Mac AMD
​https://bugs.webkit.org/show_bug.cgi?id=220093

Patch by Kenneth Russell <​kbr@chromium.org> on 2020-12-22
Reviewed by Alex Christensen.

Promote the RGBA4444 and RGB565 texture formats to RGB[A]8 in
order to work around OpenGL driver bugs on macOS with AMD GPUs.

• include/platform/FeaturesGL.h:
• src/libANGLE/renderer/gl/formatutilsgl.cpp:

(rx::nativegl::GetNativeInternalFormat):

• src/libANGLE/renderer/gl/renderergl_utils.cpp:

(rx::nativegl_gl::InitializeFeatures):

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• include/platform/FeaturesGL.h (modified) (1 diff)
• src/libANGLE/renderer/gl/formatutilsgl.cpp (modified) (2 diffs)
• src/libANGLE/renderer/gl/renderergl_utils.cpp (modified) (2 diffs)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2020-12-22  Kenneth Russell  <kbr@chromium.org>
+
+        [WebGL2] deqp/functional/gles3/texturespecification RGB4444 and RGB565 failures on Mac AMD
+        https://bugs.webkit.org/show_bug.cgi?id=220093
+
+        Reviewed by Alex Christensen.
+
+        Promote the RGBA4444 and RGB565 texture formats to RGB[A]8 in
+        order to work around OpenGL driver bugs on macOS with AMD GPUs.
+
+        * include/platform/FeaturesGL.h:
+        * src/libANGLE/renderer/gl/formatutilsgl.cpp:
+        (rx::nativegl::GetNativeInternalFormat):
+        * src/libANGLE/renderer/gl/renderergl_utils.cpp:
+        (rx::nativegl_gl::InitializeFeatures):
+
 2020-12-16  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/ThirdParty/ANGLE/include/platform/FeaturesGL.h

@@ -506 +506 @@
         "glGenerateMipmap fails if the zero texture level is not set on some Mac drivers.",
         &members};
+
+    // On macOS with AMD GPUs, most of the packed color formats like RGB565 and RGBA4444 are
+    // buggy. Promote them to 8 bit per channel formats.
+    Feature promotePackedFormatsTo8BitPerChannel = {
+        "promote_packed_formats_to_8_bit_per_channel", FeatureCategory::OpenGLWorkarounds,
+        "Packed color formats are buggy on Macs with AMD GPUs", &members, "https://anglebug.com/4849"};
 };
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp

@@ -496 +496 @@
         }
 
-        if (features.rgba4IsNotSupportedForColorRendering.enabled &&
-            internalFormat.sizedInternalFormat == GL_RGBA4)
+        if (internalFormat.sizedInternalFormat == GL_RGBA4 &&
+            (features.rgba4IsNotSupportedForColorRendering.enabled ||
+             features.promotePackedFormatsTo8BitPerChannel.enabled))
         {
             // Use an 8-bit format instead
@@ -504 +505 @@
 
         if (internalFormat.sizedInternalFormat == GL_RGB565 &&
-            !functions->isAtLeastGL(gl::Version(4, 1)) &&
-            !functions->hasGLExtension("GL_ARB_ES2_compatibility"))
+            ((!functions->isAtLeastGL(gl::Version(4, 1)) &&
+              !functions->hasGLExtension("GL_ARB_ES2_compatibility")) ||
+             features.promotePackedFormatsTo8BitPerChannel.enabled))
         {
             // GL_RGB565 is required for basic ES2 functionality but was not added to desktop GL

trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp

@@ -1613 +1613 @@
     bool isQualcomm = IsQualcomm(vendor);
     bool isVMWare   = IsVMWare(vendor);
+    bool hasAMD     = systemInfo.hasAMDGPU();
 
     std::array<int, 3> mesaVersion = {0, 0, 0};
@@ -1863 +1864 @@
 
     ANGLE_FEATURE_CONDITION(features, setZeroLevelBeforeGenerateMipmap, IsApple());
+
+    ANGLE_FEATURE_CONDITION(features, promotePackedFormatsTo8BitPerChannel, IsApple() && hasAMD);
 }