Changeset 267811 in webkit

Timestamp:

Sep 30, 2020 5:01:35 PM (4 years ago)

Author:

James Darpinian

Message:

Expose pvrtc extension without vendor prefix and remove redundant WebGL 2 extensions
​https://bugs.webkit.org/show_bug.cgi?id=217110

Reviewed by Kenneth Russell.

Extensions are tested in LayoutTests/webgl

• html/canvas/WebGL2RenderingContext.cpp:

(WebCore::WebGL2RenderingContext::getExtension):
(WebCore::WebGL2RenderingContext::getSupportedExtensions):

• html/canvas/WebGLRenderingContext.cpp:

(WebCore::WebGLRenderingContext::getExtension):
(WebCore::WebGLRenderingContext::getSupportedExtensions):

Location:

trunk

Files:

• LayoutTests/webgl/2.0.0/conformance2/extensions/promoted-extensions-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (modified) (6 diffs)
• Source/WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (2 diffs)

trunk/LayoutTests/webgl/2.0.0/conformance2/extensions/promoted-extensions-expected.txt

@@ -2 +2 @@
 
 Test: ../../resources/webgl_test_files/conformance2/extensions/promoted-extensions.html
-
-[ 1: PASS ] gl = wtu.create3DContext(undefined, undefined, 2) is non-null.
-[ 2: PASS ] ANGLE_instanced_arrays was not exposed in the WebGL 2.0 context
-[ 3: PASS ] EXT_blend_minmax was not exposed in the WebGL 2.0 context
-[ 4: PASS ] EXT_frag_depth was not exposed in the WebGL 2.0 context
-[ 5: PASS ] EXT_shader_texture_lod was not exposed in the WebGL 2.0 context
-[ 6: PASS ] EXT_sRGB was not exposed in the WebGL 2.0 context
-[ 7: PASS ] OES_element_index_uint was not exposed in the WebGL 2.0 context
-[ 8: PASS ] OES_standard_derivatives was not exposed in the WebGL 2.0 context
-[ 9: FAIL ] OES_texture_float was exposed in the WebGL 2.0 context but should not have been
-[ 10: FAIL ] OES_texture_half_float was exposed in the WebGL 2.0 context but should not have been
-[ 11: FAIL ] OES_texture_half_float_linear was exposed in the WebGL 2.0 context but should not have been
-[ 12: PASS ] OES_vertex_array_object was not exposed in the WebGL 2.0 context
-[ 13: FAIL ] WEBGL_depth_texture was exposed in the WebGL 2.0 context but should not have been
-[ 14: PASS ] WEBGL_draw_buffers was not exposed in the WebGL 2.0 context
-[ 15: PASS ] successfullyParsed is true
-[ FAIL ] 4 failures reported
+[ PASS ] All tests passed

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-30  James Darpinian  <jdarpinian@chromium.org>
+
+        Expose pvrtc extension without vendor prefix and remove redundant WebGL 2 extensions
+        https://bugs.webkit.org/show_bug.cgi?id=217110
+
+        Reviewed by Kenneth Russell.
+
+        Extensions are tested in LayoutTests/webgl
+
+        * html/canvas/WebGL2RenderingContext.cpp:
+        (WebCore::WebGL2RenderingContext::getExtension):
+        (WebCore::WebGL2RenderingContext::getSupportedExtensions):
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::getExtension):
+        (WebCore::WebGLRenderingContext::getSupportedExtensions):
+
 2020-09-30  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -43 +43 @@
 #include "InspectorInstrumentation.h"
 #include "Logging.h"
-#include "OESTextureFloat.h"
 #include "OESTextureFloatLinear.h"
-#include "OESTextureHalfFloat.h"
-#include "OESTextureHalfFloatLinear.h"
 #include "RenderBox.h"
 #include "RuntimeEnabledFeatures.h"
@@ -59 +56 @@
 #include "WebGLDebugRendererInfo.h"
 #include "WebGLDebugShaders.h"
-#include "WebGLDepthTexture.h"
 #include "WebGLLoseContext.h"
 #include "WebGLQuery.h"
@@ -2677 +2673 @@
 
     ENABLE_IF_REQUESTED(EXTTextureFilterAnisotropic, m_extTextureFilterAnisotropic, "EXT_texture_filter_anisotropic", enableSupportedExtension("GL_EXT_texture_filter_anisotropic"_s));
-    ENABLE_IF_REQUESTED(OESTextureFloat, m_oesTextureFloat, "OES_texture_float", enableSupportedExtension("GL_OES_texture_float"_s));
     ENABLE_IF_REQUESTED(OESTextureFloatLinear, m_oesTextureFloatLinear, "OES_texture_float_linear", enableSupportedExtension("GL_OES_texture_float_linear"_s));
-    ENABLE_IF_REQUESTED(OESTextureHalfFloat, m_oesTextureHalfFloat, "OES_texture_half_float", enableSupportedExtension("GL_OES_texture_half_float"_s));
-    ENABLE_IF_REQUESTED(OESTextureHalfFloatLinear, m_oesTextureHalfFloatLinear, "OES_texture_half_float_linear", enableSupportedExtension("GL_OES_texture_half_float_linear"_s));
     ENABLE_IF_REQUESTED(WebGLLoseContext, m_webglLoseContext, "WEBGL_lose_context", true);
     ENABLE_IF_REQUESTED(WebGLCompressedTextureASTC, m_webglCompressedTextureASTC, "WEBGL_compressed_texture_astc", WebGLCompressedTextureASTC::supported(*this));
@@ -2687 +2680 @@
     ENABLE_IF_REQUESTED(WebGLCompressedTextureETC1, m_webglCompressedTextureETC1, "WEBGL_compressed_texture_etc1", WebGLCompressedTextureETC1::supported(*this));
     ENABLE_IF_REQUESTED(WebGLCompressedTexturePVRTC, m_webglCompressedTexturePVRTC, "WEBKIT_WEBGL_compressed_texture_pvrtc", WebGLCompressedTexturePVRTC::supported(*this));
+    ENABLE_IF_REQUESTED(WebGLCompressedTexturePVRTC, m_webglCompressedTexturePVRTC, "WEBGL_compressed_texture_pvrtc", WebGLCompressedTexturePVRTC::supported(*this));
     ENABLE_IF_REQUESTED(WebGLCompressedTextureS3TC, m_webglCompressedTextureS3TC, "WEBGL_compressed_texture_s3tc", WebGLCompressedTextureS3TC::supported(*this));
     ENABLE_IF_REQUESTED(WebGLCompressedTextureS3TCsRGB, m_webglCompressedTextureS3TCsRGB, "WEBGL_compressed_texture_s3tc_srgb", WebGLCompressedTextureS3TCsRGB::supported(*this));
-    ENABLE_IF_REQUESTED(WebGLDepthTexture, m_webglDepthTexture, "WEBGL_depth_texture", WebGLDepthTexture::supported(*graphicsContextGL()));
     ENABLE_IF_REQUESTED(WebGLDebugRendererInfo, m_webglDebugRendererInfo, "WEBGL_debug_renderer_info", true);
     ENABLE_IF_REQUESTED(WebGLDebugShaders, m_webglDebugShaders, "WEBGL_debug_shaders", m_context->getExtensions().supports("GL_ANGLE_translated_shader_source"_s));
@@ -2709 +2702 @@
 
     auto& extensions = m_context->getExtensions();
-    if (extensions.supports("GL_OES_texture_float"_s))
-        result.append("OES_texture_float"_s);
     if (extensions.supports("GL_OES_texture_float_linear"_s))
         result.append("OES_texture_float_linear"_s);
-    if (extensions.supports("GL_OES_texture_half_float"_s))
-        result.append("OES_texture_half_float"_s);
-    if (extensions.supports("GL_OES_texture_half_float_linear"_s))
-        result.append("OES_texture_half_float_linear"_s);
     if (extensions.supports("GL_EXT_texture_filter_anisotropic"_s))
         result.append("EXT_texture_filter_anisotropic"_s);
@@ -2727 +2714 @@
     if (WebGLCompressedTextureETC1::supported(*this))
         result.append("WEBGL_compressed_texture_etc1"_s);
-    if (WebGLCompressedTexturePVRTC::supported(*this))
+    if (WebGLCompressedTexturePVRTC::supported(*this)) {
         result.append("WEBKIT_WEBGL_compressed_texture_pvrtc"_s);
+        result.append("WEBGL_compressed_texture_pvrtc"_s);
+    }
     if (WebGLCompressedTextureS3TC::supported(*this))
         result.append("WEBGL_compressed_texture_s3tc"_s);
     if (WebGLCompressedTextureS3TCsRGB::supported(*this))
         result.append("WEBGL_compressed_texture_s3tc_srgb"_s);
-    if (WebGLDepthTexture::supported(*graphicsContextGL()))
-        result.append("WEBGL_depth_texture"_s);
     result.append("WEBGL_lose_context"_s);
     if (extensions.supports("GL_ANGLE_translated_shader_source"_s))

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

@@ -168 +168 @@
     ENABLE_IF_REQUESTED(WebGLCompressedTextureETC1, m_webglCompressedTextureETC1, "WEBGL_compressed_texture_etc1", WebGLCompressedTextureETC1::supported(*this));
     ENABLE_IF_REQUESTED(WebGLCompressedTexturePVRTC, m_webglCompressedTexturePVRTC, "WEBKIT_WEBGL_compressed_texture_pvrtc", WebGLCompressedTexturePVRTC::supported(*this));
+    ENABLE_IF_REQUESTED(WebGLCompressedTexturePVRTC, m_webglCompressedTexturePVRTC, "WEBGL_compressed_texture_pvrtc", WebGLCompressedTexturePVRTC::supported(*this));
     ENABLE_IF_REQUESTED(WebGLCompressedTextureS3TC, m_webglCompressedTextureS3TC, "WEBGL_compressed_texture_s3tc", WebGLCompressedTextureS3TC::supported(*this));
     ENABLE_IF_REQUESTED(WebGLCompressedTextureS3TCsRGB, m_webglCompressedTextureS3TCsRGB, "WEBGL_compressed_texture_s3tc_srgb", WebGLCompressedTextureS3TCsRGB::supported(*this));
@@ -248 +249 @@
     if (WebGLCompressedTextureETC1::supported(*this))
         result.append("WEBGL_compressed_texture_etc1"_s);
-    if (WebGLCompressedTexturePVRTC::supported(*this))
+    if (WebGLCompressedTexturePVRTC::supported(*this)) {
         result.append("WEBKIT_WEBGL_compressed_texture_pvrtc"_s);
+        result.append("WEBGL_compressed_texture_pvrtc"_s);
+    }
     if (WebGLCompressedTextureS3TC::supported(*this))
         result.append("WEBGL_compressed_texture_s3tc"_s);