Changeset 261769 in webkit

Timestamp:

May 15, 2020 4:57:24 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

OES_texture_float internal format conversion must depend on WEBGL_color_buffer_float
​https://bugs.webkit.org/show_bug.cgi?id=211971

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

Only adjust the internal formats of textures created for the WebGL
1.0 OES_texture_float extension if the WEBGL_color_buffer_float
extension has been enabled.

Covered by the WebGL 1.0 OES_texture_float conformance tests when
run on iOS with another forthcoming fix to ANGLE which will enable
the OES_texture_float extension on that platform.

• platform/graphics/angle/ExtensionsGLANGLE.cpp:

(WebCore::ExtensionsGLANGLE::ensureEnabled):
(WebCore::ExtensionsGLANGLE::adjustWebGL1TextureInternalFormat):

• platform/graphics/angle/ExtensionsGLANGLE.h:
• platform/graphics/angle/GraphicsContextGLANGLE.cpp:

(WebCore::GraphicsContextGLOpenGL::texImage2DDirect):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/angle/ExtensionsGLANGLE.cpp (modified) (2 diffs)
• platform/graphics/angle/ExtensionsGLANGLE.h (modified) (2 diffs)
• platform/graphics/angle/GraphicsContextGLANGLE.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-15  Kenneth Russell  <kbr@chromium.org>
+
+        OES_texture_float internal format conversion must depend on WEBGL_color_buffer_float
+        https://bugs.webkit.org/show_bug.cgi?id=211971
+
+        Reviewed by Dean Jackson.
+
+        Only adjust the internal formats of textures created for the WebGL
+        1.0 OES_texture_float extension if the WEBGL_color_buffer_float
+        extension has been enabled.
+
+        Covered by the WebGL 1.0 OES_texture_float conformance tests when
+        run on iOS with another forthcoming fix to ANGLE which will enable
+        the OES_texture_float extension on that platform.
+
+        * platform/graphics/angle/ExtensionsGLANGLE.cpp:
+        (WebCore::ExtensionsGLANGLE::ensureEnabled):
+        (WebCore::ExtensionsGLANGLE::adjustWebGL1TextureInternalFormat):
+        * platform/graphics/angle/ExtensionsGLANGLE.h:
+        * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+        (WebCore::GraphicsContextGLOpenGL::texImage2DDirect):
+
 2020-05-15  Oriol Brufau  <obrufau@igalia.com>
 

trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp

@@ -88 +88 @@
         gl::RequestExtensionANGLE(name.ascii().data());
         m_enabledExtensions.add(name);
+
+        if (name == "GL_CHROMIUM_color_buffer_float_rgba"_s)
+            m_webglColorBufferFloatRGBA = true;
+        else if (name == "GL_CHROMIUM_color_buffer_float_rgb"_s)
+            m_webglColorBufferFloatRGB = true;
     }
 }
@@ -250 +255 @@
 {
     // The implementation of WEBGL_color_buffer_float for WebGL 1.0 / ES 2.0 requires a sized
-    // internal format. Adjust it if necessary at this lowest level. Note that it does not matter at
-    // this point whether the WEBGL_color_buffer_float extension has actually been enabled at higher
-    // levels; the enum will be valid or invalid either way.
+    // internal format. Adjust it if necessary at this lowest level.
     if (type == GL_FLOAT) {
-        if (format == GL_RGBA && internalformat == GL_RGBA)
+        if (m_webglColorBufferFloatRGBA && format == GL_RGBA && internalformat == GL_RGBA)
             return GL_RGBA32F;
-        if (format == GL_RGB && internalformat == GL_RGB)
+        if (m_webglColorBufferFloatRGB && format == GL_RGB && internalformat == GL_RGB)
             return GL_RGB32F;
     }

trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.h

@@ -149 +149 @@
 
     // Only for non-WebGL 2.0 contexts.
-    static GCGLenum adjustWebGL1TextureInternalFormat(GCGLenum internalformat, GCGLenum format, GCGLenum type);
+    GCGLenum adjustWebGL1TextureInternalFormat(GCGLenum internalformat, GCGLenum format, GCGLenum type);
 
 private:
@@ -175 +175 @@
     String m_vendor;
     String m_renderer;
+
+    // Whether the WebGL 1.0-related floating-point renderability extensions have been enabled.
+    bool m_webglColorBufferFloatRGB { false };
+    bool m_webglColorBufferFloatRGBA { false };
 };
 

trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp

@@ -1889 +1889 @@
 {
     makeContextCurrent();
-    if (!m_isForWebGL2)
-        internalformat = ExtensionsGLANGLE::adjustWebGL1TextureInternalFormat(internalformat, format, type);
+    if (!m_isForWebGL2 && m_extensions)
+        internalformat = m_extensions->adjustWebGL1TextureInternalFormat(internalformat, format, type);
     gl::TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());