Changeset 262074 in webkit

Timestamp:

May 22, 2020 2:30:30 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[ANGLE - iOS] fast/canvas/webgl/webgl-depth-texture.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=212271

Patch by Kenneth Russell <​kbr@chromium.org> on 2020-05-22
Reviewed by Dean Jackson.

Source/ThirdParty/ANGLE:

Use ES 3.0 sized internal formats for unsized depth/stencil
textures when the OES_depth_texture extension is unavailable - as
is the case in iOS's ES 3.0 driver.

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

(rx::nativegl::GetNativeInternalFormat):

LayoutTests:

Remove expected failure of webgl-depth-texture on iOS.

• platform/ios/fast/canvas/webgl/webgl-depth-texture-expected.txt: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios/fast/canvas/webgl/webgl-depth-texture-expected.txt (deleted)
• Source/ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/formatutilsgl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-05-22  Kenneth Russell  <kbr@chromium.org>
+
+        [ANGLE - iOS] fast/canvas/webgl/webgl-depth-texture.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=212271
+
+        Reviewed by Dean Jackson.
+
+        Remove expected failure of webgl-depth-texture on iOS.
+
+        * platform/ios/fast/canvas/webgl/webgl-depth-texture-expected.txt: Removed.
+
 2020-05-22  Andy Estes  <aestes@apple.com>
 

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2020-05-22  Kenneth Russell  <kbr@chromium.org>
+
+        [ANGLE - iOS] fast/canvas/webgl/webgl-depth-texture.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=212271
+
+        Reviewed by Dean Jackson.
+
+        Use ES 3.0 sized internal formats for unsized depth/stencil
+        textures when the OES_depth_texture extension is unavailable - as
+        is the case in iOS's ES 3.0 driver.
+
+        * src/libANGLE/renderer/gl/formatutilsgl.cpp:
+        (rx::nativegl::GetNativeInternalFormat):
+
 2020-05-21  Dean Jackson  <dino@apple.com>
 

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

@@ -548 +548 @@
             result = internalFormat.sizedInternalFormat;
         }
+        else if ((internalFormat.internalFormat == GL_DEPTH_COMPONENT ||
+                  internalFormat.internalFormat == GL_DEPTH_STENCIL) &&
+                 !functions->hasGLESExtension("GL_OES_depth_texture"))
+        {
+            // Use ES 3.0 sized internal formats for depth/stencil textures when the driver doesn't
+            // advertise GL_OES_depth_texture, since it's likely the driver will reject unsized
+            // internal formats.
+            switch (internalFormat.internalFormat)
+            {
+                case GL_DEPTH_COMPONENT:
+                    if (internalFormat.type == GL_UNSIGNED_SHORT)
+                    {
+                        // Could consider promoting this to a higher bit depth
+                        result = GL_DEPTH_COMPONENT16;
+                    }
+                    else if (internalFormat.type == GL_UNSIGNED_INT)
+                    {
+                        if (functions->hasGLESExtension("GL_OES_depth32"))
+                        {
+                            result = GL_DEPTH_COMPONENT32_OES;
+                        }
+                        else
+                        {
+                            // Best-effort attempt to provide as many bits as possible.
+                            result = GL_DEPTH_COMPONENT24;
+                        }
+                    }
+                    else if (internalFormat.type == GL_FLOAT)
+                    {
+                        result = GL_DEPTH_COMPONENT32F;
+                    }
+                    break;
+                case GL_DEPTH_STENCIL:
+                    if (internalFormat.type == GL_UNSIGNED_INT_24_8)
+                    {
+                        result = GL_DEPTH24_STENCIL8;
+                    }
+                    else if (internalFormat.type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
+                    {
+                        result = GL_DEPTH32F_STENCIL8;
+                    }
+                    break;
+                default:
+                    UNREACHABLE();
+                    break;
+            }
+        }
     }