Changeset 295342 in webkit

Timestamp:

Jun 7, 2022, 6:08:34 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Do not enable promoted extensions in WebGL 2.0
​https://bugs.webkit.org/show_bug.cgi?id=223348

Patch by Alexey Knyazev <​3479527+lexaknyazev@users.noreply.github.com> on 2022-06-07
Reviewed by Kimmo Kinnunen.

• LayoutTests/TestExpectations:
• Source/WebCore/html/canvas/WebGL2RenderingContext.cpp:

(WebCore::WebGL2RenderingContext::initializeNewContext):
(WebCore::WebGL2RenderingContext::initializeShaderExtensions): Deleted.

• Source/WebCore/html/canvas/WebGL2RenderingContext.h:

Canonical link: ​https://commits.webkit.org/251358@main

Location:

trunk

Files:

• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (modified) (2 diffs)
• Source/WebCore/html/canvas/WebGL2RenderingContext.h (modified) (1 diff)

trunk/LayoutTests/TestExpectations

@@ -3782 +3782 @@
 webgl/2.0.y/conformance2/extensions/ext-texture-norm16.html [ Pass ]
 webgl/2.0.y/conformance2/extensions/oes-draw-buffers-indexed.html [ Pass ]
+webgl/2.0.y/conformance2/extensions/promoted-extensions-in-shaders.html [ Pass ]
 
 # WebGL 1.0.3 and 2.0.0 tests where behavior is obsolete and WebKit contains implementation

trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp

@@ -182 +182 @@
     m_boundSamplers.clear();
     m_boundSamplers.resize(m_textureUnits.size());
-
-    // FIXME: this should likely be removed.
-    initializeShaderExtensions();
 }
 
@@ -238 +235 @@
 #endif
 
-}
-
-void WebGL2RenderingContext::initializeShaderExtensions()
-{
-    // FIXME: these are in the WebGL 2.0 core API and should be removed.
-    m_context->ensureExtensionEnabled("GL_OES_standard_derivatives"_s);
-    m_context->ensureExtensionEnabled("GL_EXT_draw_buffers"_s);
-    m_context->ensureExtensionEnabled("GL_EXT_shader_texture_lod"_s);
-    m_context->ensureExtensionEnabled("GL_EXT_frag_depth"_s);
 }
 

trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h

@@ -309 +309 @@
     GCGLenum baseInternalFormatFromInternalFormat(GCGLenum internalformat);
     bool isIntegerFormat(GCGLenum internalformat);
-    void initializeShaderExtensions();
     bool setIndexedBufferBinding(const char *functionName, GCGLenum target, GCGLuint index, WebGLBuffer*);