Title: [295342] trunk
- Revision
- 295342
- Author
- [email protected]
- Date
- 2022-06-07 06:08:34 -0700 (Tue, 07 Jun 2022)
Log Message
Do not enable promoted extensions in WebGL 2.0
https://bugs.webkit.org/show_bug.cgi?id=223348
Patch by Alexey Knyazev <[email protected]> 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
Modified Paths
Diff
Modified: trunk/LayoutTests/TestExpectations (295341 => 295342)
--- trunk/LayoutTests/TestExpectations 2022-06-07 11:42:59 UTC (rev 295341)
+++ trunk/LayoutTests/TestExpectations 2022-06-07 13:08:34 UTC (rev 295342)
@@ -3781,6 +3781,7 @@
webgl/2.0.y/conformance/extensions/webgl-compressed-texture-s3tc-srgb.html [ Pass ]
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
# and tests for the new behavior. Should be removed once 1.0.3 and 2.0.0 are retired.
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (295341 => 295342)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2022-06-07 11:42:59 UTC (rev 295341)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2022-06-07 13:08:34 UTC (rev 295342)
@@ -181,9 +181,6 @@
ASSERT(m_textureUnits.size() >= 8);
m_boundSamplers.clear();
m_boundSamplers.resize(m_textureUnits.size());
-
- // FIXME: this should likely be removed.
- initializeShaderExtensions();
}
void WebGL2RenderingContext::resetUnpackParameters()
@@ -239,15 +236,6 @@
}
-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);
-}
-
bool WebGL2RenderingContext::validateBufferTarget(const char* functionName, GCGLenum target)
{
switch (target) {
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h (295341 => 295342)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2022-06-07 11:42:59 UTC (rev 295341)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h 2022-06-07 13:08:34 UTC (rev 295342)
@@ -308,7 +308,6 @@
GCGLenum baseInternalFormatFromInternalFormat(GCGLenum internalformat);
bool isIntegerFormat(GCGLenum internalformat);
- void initializeShaderExtensions();
bool setIndexedBufferBinding(const char *functionName, GCGLenum target, GCGLuint index, WebGLBuffer*);
IntRect getTextureSourceSubRectangle(GCGLsizei width, GCGLsizei height);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
