Changeset 271075 in webkit

Timestamp:

Dec 23, 2020 12:06:00 PM (22 months ago)

Author:

Fujii Hironori

Message:

[WinCairo] Enable WebGL 2
​https://bugs.webkit.org/show_bug.cgi?id=192314

Reviewed by Kenneth Russell.

.:

• Source/cmake/OptionsWin.cmake: Turned ENABLE_WEBGL2 on.

Source/WebCore:

• platform/graphics/texmap/ANGLEContext.cpp:

(WebCore::ANGLEContext::createContext): Added context attributes
for WebGL by copying the code of GraphicsContextGLOpenGLCocoa.mm.

LayoutTests:

• platform/wincairo/TestExpectations:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wincairo/TestExpectations (modified) (6 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/ANGLEContext.cpp (modified) (2 diffs)
• Source/cmake/OptionsWin.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2020-12-23  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] Enable WebGL 2
+        https://bugs.webkit.org/show_bug.cgi?id=192314
+
+        Reviewed by Kenneth Russell.
+
+        * Source/cmake/OptionsWin.cmake: Turned ENABLE_WEBGL2 on.
+
 2020-12-23  Monson Shao  <holymonson@gmail.com>
 

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-12-23  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] Enable WebGL 2
+        https://bugs.webkit.org/show_bug.cgi?id=192314
+
+        Reviewed by Kenneth Russell.
+
+        * platform/wincairo/TestExpectations:
+
 2020-12-23  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/platform/wincairo/TestExpectations

@@ -268 +268 @@
 webrtc [ Skip ]
 
-# WEBGL2 is disabled
-fast/canvas/webgl/webgl2 [ Skip ]
-fast/canvas/webgl/bufferData-offset-length.html [ Skip ]
-fast/canvas/webgl/copyBufferSubData.html [ Skip ]
-fast/canvas/webgl/getBufferSubData-webgl1.html [ Skip ]
-fast/canvas/webgl/webgl2-buffer-targets.html [ Skip ]
-fast/canvas/webgl/webgl2-buffers.html [ Skip ]
-fast/canvas/webgl/webgl2-context-creation.html [ Skip ]
-fast/canvas/webgl/webgl2-getActiveUniforms.html [ Skip ]
-fast/canvas/webgl/webgl2-runtime-flag.html [ Skip ]
-fast/canvas/webgl/webgl2-texStorage.html [ Skip ]
-fast/canvas/webgl/webgl2-texture-upload-enums.html [ Skip ]
-inspector/canvas/requestContent-webgl2.html [ Skip ]
-inspector/canvas/create-context-webgl2.html [ Skip ]
-inspector/canvas/recording-webgl2-snapshots.html [ Skip ]
-inspector/canvas/resolveContext-webgl2.html [ Skip ]
-inspector/canvas/shaderProgram-add-remove-webgl2.html [ Skip ]
-webgl/webgl2-rendering-context-defined.html [ Skip ]
-webgl/webgl2-rendering-context-obtain.html [ Skip ]
-
 # WEBGPU is disabled
 webgpu [ Skip ]
@@ -455 +435 @@
 webkit.org/b/219842 fast/events/wheel/wheel-event-listeners-on-window-made-passive.html [ Skip ]
 webkit.org/b/219842 fast/events/wheel/wheel-events-become-non-cancelable.html [ Skip ]
+
+# Needs WebGL video texture support
+webgl/1.0.3/conformance/extensions/oes-texture-float-with-video.html [ Skip ]
+webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-video.html [ Skip ]
+webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html [ Skip ]
+webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html [ Skip ]
+webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html [ Skip ]
+webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video.html [ Skip ]
+webgl/2.0.0/conformance/extensions/oes-texture-float-with-video.html [ Skip ]
+webgl/2.0.0/conformance/extensions/oes-texture-half-float-with-video.html [ Skip ]
+webgl/2.0.0/conformance/textures/image_bitmap_from_video [ Skip ]
+webgl/2.0.0/conformance/textures/video [ Skip ]
+webgl/2.0.0/conformance2/textures/image_bitmap_from_video [ Skip ]
+webgl/2.0.0/conformance2/textures/video [ Skip ]
 
 #//////////////////////////////////////////////////////////////////////////////////////////
@@ -1220 +1214 @@
 http/tests/subresource-integrity [ Skip ]
 http/tests/webarchive [ Skip ]
-http/tests/webgl [ Skip ]
 http/tests/webrtc [ Skip ]
 
@@ -1798 +1791 @@
 userscripts [ Skip ]
 webanimations [ Skip ]
-webgl/2.0.0 [ Skip ]
-webgl/conformance2 [ Skip ]
+webgl/2.0.0/conformance/textures/image_bitmap_from_image_bitmap [ Skip ]
+webgl/2.0.0/conformance2/textures/image_bitmap_from_image_bitmap [ Skip ]
 workers/bomb.html [ Skip ]
 
@@ -1821 +1814 @@
 [ Debug ] storage/indexeddb/database-odd-names.html [ Failure Pass ]
 [ Debug ] storage/indexeddb/primary-key-unique-to-objectstore.html [ Timeout Pass ]
+[ Debug ] webgl/1.0.3/conformance/canvas/drawingbuffer-test.html [ Skip ] # Crash by assertion failure
+[ Debug ] webgl/1.0.3/conformance/glsl/bugs/long-expressions-should-not-crash.html [ Slow ]
+[ Debug ] webgl/1.0.3/conformance/rendering/many-draw-calls.html [ Slow ]
+[ Debug ] webgl/1.0.3/conformance/rendering/multisample-corruption.html [ Slow ]
+[ Debug ] webgl/1.0.3/conformance/state/gl-object-get-calls.html [ Slow ]
+[ Debug ] webgl/1.0.3/conformance/textures/texture-size-limit.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/attribs/gl-vertexattribpointer.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/canvas/drawingbuffer-test.html [ Skip ] # Crash by assertion failure
+[ Debug ] webgl/2.0.0/conformance/glsl/bugs/complex-glsl-does-not-crash.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/glsl/bugs/compound-assignment-type-combination.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/glsl/bugs/compound-assignment-type-combination.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/glsl/constructors/glsl-construct-ivec4.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/glsl/constructors/glsl-construct-vec4.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/glsl/misc/const-variable-initialization.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/glsl/misc/const-variable-initialization.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/glsl/misc/shader-uniform-packing-restrictions.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/glsl/misc/shader-uniform-packing-restrictions.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/glsl/misc/struct-nesting-of-variable-names.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/rendering/many-draw-calls.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/rendering/multisample-corruption.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/state/gl-object-get-calls.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/textures/misc/tex-image-and-sub-image-2d-with-array-buffer-view.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance/textures/misc/tex-image-and-sub-image-2d-with-array-buffer-view.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance2/rendering/blitframebuffer-filter-outofbounds.html [ Slow ]
+[ Debug ] webgl/2.0.0/conformance2/textures/misc/copy-texture-image-luma-format.html [ Slow ]
+[ Release ] webgl/1.0.3/conformance/canvas/drawingbuffer-test.html [ Failure ]
+[ Release ] webgl/2.0.0/conformance/canvas/drawingbuffer-test.html [ Failure ]
 animations/additive-transform-animations.html [ ImageOnlyFailure ]
 animations/needs-layout.html [ ImageOnlyFailure ]
@@ -2131 +2153 @@
 performance-api/paint-timing/performance-observer-first-contentful-paint.html [ Timeout ]
 storage/indexeddb/storage-limit-with-indices.html [ Failure ]
-webgl/1.0.3/conformance/canvas/drawingbuffer-test.html [ Skip ] # Timeout
 webgl/1.0.3/conformance/context/premultiplyalpha-test.html [ Failure ]
 webgl/1.0.3/conformance/extensions/oes-element-index-uint.html [ Failure ]
-webgl/1.0.3/conformance/extensions/oes-texture-float-with-video.html [ Skip ] # Timeout
-webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-video.html [ Skip ] # Timeout
 webgl/1.0.3/conformance/glsl/bugs/array-of-struct-with-int-first-position.html [ Skip ] # This test makes DumpRenderTree process unable to exit
-webgl/1.0.3/conformance/glsl/bugs/long-expressions-should-not-crash.html [ Skip ] # Timeout
 webgl/1.0.3/conformance/more/functions/readPixelsBadArgs.html [ Failure ]
 webgl/1.0.3/conformance/more/functions/texImage2DHTML.html [ Failure ]
 webgl/1.0.3/conformance/more/functions/texSubImage2DHTML.html [ Failure ]
 webgl/1.0.3/conformance/programs/program-test.html [ Failure ]
-webgl/1.0.3/conformance/renderbuffers/framebuffer-object-attachment.html [ Failure ]
 webgl/1.0.3/conformance/textures/default-texture.html [ Failure ]
-webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html [ Skip ] # Timeout
-webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html [ Skip ] # Timeout
-webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html [ Skip ] # Timeout
-webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video.html [ Skip ] # Timeout
 webgl/1.0.3/conformance/textures/texture-mips.html [ Pass Failure ]
 webgl/1.0.3/conformance/textures/texture-upload-size.html [ Skip ] # Timeout
-webgl/webgl-vertex-array-object-defined.html [ Failure ]
+webgl/1.0.3/conformance/uniforms/uniform-default-values.html [ Failure Pass ]
+webgl/2.0.0/conformance/context/premultiplyalpha-test.html [ Failure ]
+webgl/2.0.0/conformance/glsl/bugs/conditional-discard-in-loop.html [ Failure ]
+webgl/2.0.0/conformance/glsl/bugs/loop-if-loop-gradient.html [ Skip ] # Flaky timeout if it runs with other tests
+webgl/2.0.0/conformance/glsl/bugs/qualcomm-crash.html [ Skip ] # Flaky timeout if it runs with other tests
+webgl/2.0.0/conformance/glsl/bugs/qualcomm-loop-with-continue-crash.html [ Skip ] # Flaky timeout if it runs with other tests
+webgl/2.0.0/conformance/glsl/bugs/sketchfab-lighting-shader-crash.html [ Skip ] # Flaky timeout if it runs with other tests
+webgl/2.0.0/conformance/textures/misc/default-texture.html [ Failure ]
+webgl/2.0.0/conformance/textures/misc/texture-mips.html [ Failure Pass ]
+webgl/2.0.0/conformance/textures/misc/texture-upload-size.html [ Skip ] # Timeout
+webgl/2.0.0/conformance2/attribs/gl-vertexattribipointer.html [ Slow Failure ]
+webgl/2.0.0/conformance2/buffers/buffer-copying-contents.html [ Failure ]
+webgl/2.0.0/conformance2/glsl3/tricky-loop-conditions.html [ Failure ]
+webgl/2.0.0/conformance2/query/occlusion-query.html [ Failure ]
+webgl/2.0.0/conformance2/rendering/blitframebuffer-stencil-only.html [ Failure ]
+webgl/2.0.0/conformance2/rendering/element-index-uint.html [ Failure ]
+webgl/2.0.0/conformance2/state/gl-object-get-calls.html [ Slow Failure ]
+webgl/2.0.0/conformance2/textures/misc/tex-image-with-bad-args-from-dom-elements.html [ Skip ] # Timeout
+webgl/2.0.0/conformance2/transform_feedback/transform_feedback.html [ Skip ] # Timeout and flaky

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-23  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] Enable WebGL 2
+        https://bugs.webkit.org/show_bug.cgi?id=192314
+
+        Reviewed by Kenneth Russell.
+
+        * platform/graphics/texmap/ANGLEContext.cpp:
+        (WebCore::ANGLEContext::createContext): Added context attributes
+        for WebGL by copying the code of GraphicsContextGLOpenGLCocoa.mm.
+
 2020-12-23  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebCore/platform/graphics/texmap/ANGLEContext.cpp

@@ -2 +2 @@
  * Copyright (C) 2018 Metrological Group B.V.
  * Copyright (C) 2018, 2019 Igalia S.L.
- * Copyright (C) 2009-2018 Apple Inc.
+ * Copyright (C) 2009-2020 Apple Inc.
  * Copyright (C) 2020 Sony Interactive Entertainment Inc.
  *
@@ -123 +123 @@
     contextAttributes.append(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE);
     contextAttributes.append(EGL_TRUE);
+    // WebGL requires that all resources are cleared at creation.
+    contextAttributes.append(EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE);
+    contextAttributes.append(EGL_TRUE);
+    // WebGL doesn't allow client arrays.
+    contextAttributes.append(EGL_CONTEXT_CLIENT_ARRAYS_ENABLED_ANGLE);
+    contextAttributes.append(EGL_FALSE);
+    // WebGL doesn't allow implicit creation of objects on bind.
+    contextAttributes.append(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM);
+    contextAttributes.append(EGL_FALSE);
+
     if (strstr(displayExtensions, "EGL_ANGLE_power_preference")) {
         contextAttributes.append(EGL_POWER_PREFERENCE_ANGLE);

trunk/Source/cmake/OptionsWin.cmake

@@ -72 +72 @@
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_USER_MESSAGE_HANDLERS PRIVATE ON)
     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
+    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PUBLIC ON)
 
     # Experimental features