Changeset 266953 in webkit

Timestamp:

Sep 11, 2020 3:24:30 PM (4 years ago)

Author:

James Darpinian

Message:

[WebGL2] Support EXT_color_buffer_half_float on WebGL 2.0 contexts
​https://bugs.webkit.org/show_bug.cgi?id=216010

Reviewed by Kenneth Russell.

Source/ThirdParty/ANGLE:

• src/libANGLE/formatutils.cpp:

(gl::SizedHalfFloatRGTextureAttachmentSupport):
(gl::SizedHalfFloatRGBTextureAttachmentSupport):
(gl::SizedHalfFloatRGBRenderbufferSupport):
(gl::SizedHalfFloatRGBATextureAttachmentSupport):

Source/WebCore:

Added test webgl/2.0.0/conformance2/extensions/ext-color-buffer-half-float.html

• html/canvas/WebGL2RenderingContext.cpp:

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

LayoutTests:

• webgl/2.0.0/conformance2/extensions/ext-color-buffer-half-float-expected.txt: Added.
• webgl/2.0.0/conformance2/extensions/ext-color-buffer-half-float.html: Added.
• webgl/2.0.0/conformance2/extensions/promoted-extensions-expected.txt:
• webgl/2.0.0/resources/webgl_test_files/conformance2/extensions/ext-color-buffer-half-float.html: Added.
• webgl/2.0.0/resources/webgl_test_files/conformance2/extensions/promoted-extensions.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgl/2.0.0/conformance2/extensions/ext-color-buffer-half-float-expected.txt (added)
• LayoutTests/webgl/2.0.0/conformance2/extensions/ext-color-buffer-half-float.html (added)
• LayoutTests/webgl/2.0.0/conformance2/extensions/promoted-extensions-expected.txt (modified) (1 diff)
• LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance2/extensions/ext-color-buffer-half-float.html (added)
• LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance2/extensions/promoted-extensions.html (modified) (1 diff)
• Source/ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
• Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-11  James Darpinian  <jdarpinian@chromium.org>
+
+        [WebGL2] Support EXT_color_buffer_half_float on WebGL 2.0 contexts
+        https://bugs.webkit.org/show_bug.cgi?id=216010
+
+        Reviewed by Kenneth Russell.
+
+        * webgl/2.0.0/conformance2/extensions/ext-color-buffer-half-float-expected.txt: Added.
+        * webgl/2.0.0/conformance2/extensions/ext-color-buffer-half-float.html: Added.
+        * webgl/2.0.0/conformance2/extensions/promoted-extensions-expected.txt:
+        * webgl/2.0.0/resources/webgl_test_files/conformance2/extensions/ext-color-buffer-half-float.html: Added.
+        * webgl/2.0.0/resources/webgl_test_files/conformance2/extensions/promoted-extensions.html:
+
 2020-09-11  Devin Rousso  <drousso@apple.com>
 

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

@@ -6 +6 @@
 [ 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_color_buffer_half_float was not exposed in the WebGL 2.0 context
-[ 5: PASS ] EXT_frag_depth was not exposed in the WebGL 2.0 context
-[ 6: PASS ] EXT_shader_texture_lod was not exposed in the WebGL 2.0 context
-[ 7: PASS ] EXT_sRGB was not exposed in the WebGL 2.0 context
-[ 8: PASS ] OES_element_index_uint was not exposed in the WebGL 2.0 context
-[ 9: PASS ] OES_standard_derivatives was not exposed in the WebGL 2.0 context
-[ 10: FAIL ] OES_texture_float was exposed in the WebGL 2.0 context but should not have been
-[ 11: FAIL ] OES_texture_half_float was exposed in the WebGL 2.0 context but should not have been
-[ 12: FAIL ] OES_texture_half_float_linear was exposed in the WebGL 2.0 context but should not have been
-[ 13: PASS ] OES_vertex_array_object was not exposed in the WebGL 2.0 context
-[ 14: FAIL ] WEBGL_depth_texture was exposed in the WebGL 2.0 context but should not have been
-[ 15: PASS ] WEBGL_draw_buffers was not exposed in the WebGL 2.0 context
-[ 16: PASS ] successfullyParsed is true
+[ 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

trunk/LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance2/extensions/promoted-extensions.html

@@ -60 +60 @@
     "ANGLE_instanced_arrays",
     "EXT_blend_minmax",
-    "EXT_color_buffer_half_float",
     "EXT_frag_depth",
     "EXT_shader_texture_lod",

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2020-09-11  James Darpinian  <jdarpinian@chromium.org>
+
+        [WebGL2] Support EXT_color_buffer_half_float on WebGL 2.0 contexts
+        https://bugs.webkit.org/show_bug.cgi?id=216010
+
+        Reviewed by Kenneth Russell.
+
+        * src/libANGLE/formatutils.cpp:
+        (gl::SizedHalfFloatRGTextureAttachmentSupport):
+        (gl::SizedHalfFloatRGBTextureAttachmentSupport):
+        (gl::SizedHalfFloatRGBRenderbufferSupport):
+        (gl::SizedHalfFloatRGBATextureAttachmentSupport):
+
 2020-09-03  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/ThirdParty/ANGLE/src/libANGLE/formatutils.cpp

@@ -187 +187 @@
     if (clientVersion >= Version(3, 0))
     {
-        return extensions.colorBufferFloat;
+        return extensions.colorBufferFloat || (extensions.webglCompatibility && extensions.colorBufferHalfFloat);
     }
     // HALF_FLOAT_OES
@@ -254 +254 @@
         // dEQP GLES3 es3fFboColorbufferTests.cpp verifies that texture attachment of GL_RGB16F
         // is possible, so assume that all GLES implementations support it.
-        return extensions.colorBufferHalfFloat;
+        return extensions.colorBufferHalfFloat && !extensions.webglCompatibility;
     }
     // HALF_FLOAT_OES
@@ -266 +266 @@
                                                  const Extensions &extensions)
 {
-    return (clientVersion >= Version(3, 0) || extensions.textureHalfFloat) &&
-           extensions.colorBufferHalfFloat;
+    return !extensions.webglCompatibility && ((clientVersion >= Version(3, 0) || extensions.textureHalfFloat) &&
+           extensions.colorBufferHalfFloat);
 }
 
@@ -276 +276 @@
     if (clientVersion >= Version(3, 0))
     {
-        return extensions.colorBufferFloat;
+        return extensions.colorBufferFloat || (extensions.webglCompatibility && extensions.colorBufferHalfFloat);
     }
     // HALF_FLOAT_OES

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-11  James Darpinian  <jdarpinian@chromium.org>
+
+        [WebGL2] Support EXT_color_buffer_half_float on WebGL 2.0 contexts
+        https://bugs.webkit.org/show_bug.cgi?id=216010
+
+        Reviewed by Kenneth Russell.
+
+        Added test webgl/2.0.0/conformance2/extensions/ext-color-buffer-half-float.html
+
+        * html/canvas/WebGL2RenderingContext.cpp:
+        (WebCore::WebGL2RenderingContext::getExtension):
+        (WebCore::WebGL2RenderingContext::getSupportedExtensions):
+        (WebCore::WebGL2RenderingContext::renderbufferStorageImpl):
+
 2020-09-11  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -31 +31 @@
 #include "CachedImage.h"
 #include "EXTColorBufferFloat.h"
+#include "EXTColorBufferHalfFloat.h"
 #include "EXTTextureFilterAnisotropic.h"
 #include "EventLoop.h"
@@ -2689 +2690 @@
     ENABLE_IF_REQUESTED(WebGLDebugShaders, m_webglDebugShaders, "WEBGL_debug_shaders", m_context->getExtensions().supports("GL_ANGLE_translated_shader_source"_s));
     ENABLE_IF_REQUESTED(EXTColorBufferFloat, m_extColorBufferFloat, "EXT_color_buffer_float", EXTColorBufferFloat::supported(*this));
+    ENABLE_IF_REQUESTED(EXTColorBufferHalfFloat, m_extColorBufferHalfFloat, "EXT_color_buffer_half_float", EXTColorBufferHalfFloat::supported(*this));
     return nullptr;
 }
@@ -2733 +2735 @@
     if (EXTColorBufferFloat::supported(*this))
         result.append("EXT_color_buffer_float"_s);
+    if (EXTColorBufferHalfFloat::supported(*this))
+        result.append("EXT_color_buffer_half_float"_s);
 
     return result;
@@ -2962 +2966 @@
     case GraphicsContextGL::RG16F:
     case GraphicsContextGL::RGBA16F:
+        if (!extensionIsEnabled("EXT_color_buffer_float"_s) && !extensionIsEnabled("EXT_color_buffer_half_float"_s)) {
+            synthesizeGLError(GraphicsContextGL::INVALID_ENUM, functionName, "EXT_color_buffer_float or EXT_color_buffer_half_float not enabled");
+            return;
+        }
+        renderbufferStorageHelper(target, samples, internalformat, width, height);
+        break;
     case GraphicsContextGL::R32F:
     case GraphicsContextGL::RG32F: