Move WEBGL_clip_cull_distance out of draft

https://bugs.webkit.org/show_bug.cgi?id=261286 Reviewed by Kimmo Kinnunen. * LayoutTests/platform/ios-simulator/webgl/webgl-draft-extensions-flag-default-expected.txt: * LayoutTests/platform/ios-simulator/webgl/webgl-draft-extensions-flag-on-expected.txt: * LayoutTests/webgl/resources/webgl-draft-extensions-flag.js: * LayoutTests/webgl/webgl-draft-extensions-flag-default-expected.txt: * LayoutTests/webgl/webgl-draft-extensions-flag-off-expected.txt: * LayoutTests/webgl/webgl-draft-extensions-flag-on-expected.txt: * Source/WebCore/html/canvas/WebGL2RenderingContext.cpp: (WebCore::WebGL2RenderingContext::getExtension): (WebCore::WebGL2RenderingContext::getSupportedExtensions): Canonical link: https://commits.webkit.org/267795@main
WebKit · Sep 8, 2023 · 7c08950 · 7c08950
1 parent b25c98b
commit 7c08950
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 17 deletions.
diff --git a/LayoutTests/platform/ios-simulator/webgl/webgl-draft-extensions-flag-default-expected.txt b/LayoutTests/platform/ios-simulator/webgl/webgl-draft-extensions-flag-default-expected.txt
@@ -2,7 +2,7 @@ This test outputs which WebGL draft extensions are available.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-TEST COMPLETE: 40 PASS, 0 FAIL
+TEST COMPLETE: 38 PASS, 0 FAIL
 
 
 PASS webgl:EXT_blend_func_extended: Supported
@@ -36,8 +36,6 @@ PASS webgl2:NV_shader_noperspective_interpolation: Has object.
 PASS webgl2:OES_sample_variables: Supported
 PASS webgl2:OES_sample_variables: Has object.
 PASS webgl2:OES_shader_multisample_interpolation: Not supported
-PASS webgl2:WEBGL_clip_cull_distance: Supported
-PASS webgl2:WEBGL_clip_cull_distance: Has object.
 PASS webgl2:WEBGL_draw_instanced_base_vertex_base_instance: Not supported
 PASS webgl2:WEBGL_multi_draw_instanced_base_vertex_base_instance: Not supported
 PASS webgl2:WEBGL_polygon_mode: Supported

diff --git a/LayoutTests/platform/ios-simulator/webgl/webgl-draft-extensions-flag-on-expected.txt b/LayoutTests/platform/ios-simulator/webgl/webgl-draft-extensions-flag-on-expected.txt
@@ -2,7 +2,7 @@ This test outputs which WebGL draft extensions are available.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-TEST COMPLETE: 40 PASS, 0 FAIL
+TEST COMPLETE: 38 PASS, 0 FAIL
 
 
 PASS webgl:EXT_blend_func_extended: Supported
@@ -36,8 +36,6 @@ PASS webgl2:NV_shader_noperspective_interpolation: Has object.
 PASS webgl2:OES_sample_variables: Supported
 PASS webgl2:OES_sample_variables: Has object.
 PASS webgl2:OES_shader_multisample_interpolation: Not supported
-PASS webgl2:WEBGL_clip_cull_distance: Supported
-PASS webgl2:WEBGL_clip_cull_distance: Has object.
 PASS webgl2:WEBGL_draw_instanced_base_vertex_base_instance: Not supported
 PASS webgl2:WEBGL_multi_draw_instanced_base_vertex_base_instance: Not supported
 PASS webgl2:WEBGL_polygon_mode: Supported

diff --git a/LayoutTests/webgl/resources/webgl-draft-extensions-flag.js b/LayoutTests/webgl/resources/webgl-draft-extensions-flag.js
@@ -22,7 +22,6 @@ let currentDraftExtensions = {
         "NV_shader_noperspective_interpolation",
         "OES_sample_variables",
         "OES_shader_multisample_interpolation",
-        "WEBGL_clip_cull_distance",
         "WEBGL_draw_instanced_base_vertex_base_instance",
         "WEBGL_multi_draw_instanced_base_vertex_base_instance",
         "WEBGL_polygon_mode",

diff --git a/LayoutTests/webgl/webgl-draft-extensions-flag-default-expected.txt b/LayoutTests/webgl/webgl-draft-extensions-flag-default-expected.txt
@@ -2,7 +2,7 @@ This test outputs which WebGL draft extensions are available.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-TEST COMPLETE: 43 PASS, 0 FAIL
+TEST COMPLETE: 41 PASS, 0 FAIL
 
 
 PASS webgl:EXT_blend_func_extended: Supported
@@ -37,8 +37,6 @@ PASS webgl2:OES_sample_variables: Supported
 PASS webgl2:OES_sample_variables: Has object.
 PASS webgl2:OES_shader_multisample_interpolation: Supported
 PASS webgl2:OES_shader_multisample_interpolation: Has object.
-PASS webgl2:WEBGL_clip_cull_distance: Supported
-PASS webgl2:WEBGL_clip_cull_distance: Has object.
 PASS webgl2:WEBGL_draw_instanced_base_vertex_base_instance: Supported
 PASS webgl2:WEBGL_draw_instanced_base_vertex_base_instance: Has object.
 PASS webgl2:WEBGL_multi_draw_instanced_base_vertex_base_instance: Supported

diff --git a/LayoutTests/webgl/webgl-draft-extensions-flag-off-expected.txt b/LayoutTests/webgl/webgl-draft-extensions-flag-off-expected.txt
@@ -2,7 +2,7 @@ This test outputs which WebGL draft extensions are available.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-TEST COMPLETE: 22 PASS, 0 FAIL
+TEST COMPLETE: 21 PASS, 0 FAIL
 
 
 PASS webgl:EXT_blend_func_extended: Not supported
@@ -21,7 +21,6 @@ PASS webgl2:EXT_texture_mirror_clamp_to_edge: Not supported
 PASS webgl2:NV_shader_noperspective_interpolation: Not supported
 PASS webgl2:OES_sample_variables: Not supported
 PASS webgl2:OES_shader_multisample_interpolation: Not supported
-PASS webgl2:WEBGL_clip_cull_distance: Not supported
 PASS webgl2:WEBGL_draw_instanced_base_vertex_base_instance: Not supported
 PASS webgl2:WEBGL_multi_draw_instanced_base_vertex_base_instance: Not supported
 PASS webgl2:WEBGL_polygon_mode: Not supported

diff --git a/LayoutTests/webgl/webgl-draft-extensions-flag-on-expected.txt b/LayoutTests/webgl/webgl-draft-extensions-flag-on-expected.txt
@@ -2,7 +2,7 @@ This test outputs which WebGL draft extensions are available.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-TEST COMPLETE: 43 PASS, 0 FAIL
+TEST COMPLETE: 41 PASS, 0 FAIL
 
 
 PASS webgl:EXT_blend_func_extended: Supported
@@ -37,8 +37,6 @@ PASS webgl2:OES_sample_variables: Supported
 PASS webgl2:OES_sample_variables: Has object.
 PASS webgl2:OES_shader_multisample_interpolation: Supported
 PASS webgl2:OES_shader_multisample_interpolation: Has object.
-PASS webgl2:WEBGL_clip_cull_distance: Supported
-PASS webgl2:WEBGL_clip_cull_distance: Has object.
 PASS webgl2:WEBGL_draw_instanced_base_vertex_base_instance: Supported
 PASS webgl2:WEBGL_draw_instanced_base_vertex_base_instance: Has object.
 PASS webgl2:WEBGL_multi_draw_instanced_base_vertex_base_instance: Supported

diff --git a/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp b/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp
@@ -2570,7 +2570,7 @@ std::optional<WebGLExtensionAny> WebGL2RenderingContext::getExtension(const Stri
     ENABLE_IF_REQUESTED(OESSampleVariables, m_oesSampleVariables, "OES_sample_variables"_s, OESSampleVariables::supported(*m_context) && enableDraftExtensions);
     ENABLE_IF_REQUESTED(OESShaderMultisampleInterpolation, m_oesShaderMultisampleInterpolation, "OES_shader_multisample_interpolation"_s, OESShaderMultisampleInterpolation::supported(*m_context) && enableDraftExtensions);
     ENABLE_IF_REQUESTED(OESTextureFloatLinear, m_oesTextureFloatLinear, "OES_texture_float_linear"_s, OESTextureFloatLinear::supported(*m_context));
-    ENABLE_IF_REQUESTED(WebGLClipCullDistance, m_webglClipCullDistance, "WEBGL_clip_cull_distance"_s, WebGLClipCullDistance::supported(*m_context) && enableDraftExtensions);
+    ENABLE_IF_REQUESTED(WebGLClipCullDistance, m_webglClipCullDistance, "WEBGL_clip_cull_distance"_s, WebGLClipCullDistance::supported(*m_context));
     ENABLE_IF_REQUESTED(WebGLCompressedTextureASTC, m_webglCompressedTextureASTC, "WEBGL_compressed_texture_astc"_s, WebGLCompressedTextureASTC::supported(*m_context));
     ENABLE_IF_REQUESTED(WebGLCompressedTextureETC, m_webglCompressedTextureETC, "WEBGL_compressed_texture_etc"_s, WebGLCompressedTextureETC::supported(*m_context));
     ENABLE_IF_REQUESTED(WebGLCompressedTextureETC1, m_webglCompressedTextureETC1, "WEBGL_compressed_texture_etc1"_s, WebGLCompressedTextureETC1::supported(*m_context));
@@ -2625,7 +2625,7 @@ std::optional<Vector<String>> WebGL2RenderingContext::getSupportedExtensions()
     APPEND_IF_SUPPORTED("OES_sample_variables", OESSampleVariables::supported(*m_context) && enableDraftExtensions)
     APPEND_IF_SUPPORTED("OES_shader_multisample_interpolation", OESShaderMultisampleInterpolation::supported(*m_context) && enableDraftExtensions)
     APPEND_IF_SUPPORTED("OES_texture_float_linear", OESTextureFloatLinear::supported(*m_context))
-    APPEND_IF_SUPPORTED("WEBGL_clip_cull_distance", WebGLClipCullDistance::supported(*m_context) && enableDraftExtensions)
+    APPEND_IF_SUPPORTED("WEBGL_clip_cull_distance", WebGLClipCullDistance::supported(*m_context))
     APPEND_IF_SUPPORTED("WEBGL_compressed_texture_astc", WebGLCompressedTextureASTC::supported(*m_context))
     APPEND_IF_SUPPORTED("WEBGL_compressed_texture_etc", WebGLCompressedTextureETC::supported(*m_context))
     APPEND_IF_SUPPORTED("WEBGL_compressed_texture_etc1", WebGLCompressedTextureETC1::supported(*m_context))