Attachment 345987 Details for Bug 187982 – Patch

[patch] Patch

bug-187982-20180727205953.patch (text/plain), 22.94 KB, created by Justin Fan on 2018-07-27 20:59:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Fan

Created: 2018-07-27 20:59:53 PDT

Size: 22.94 KB

patch

obsolete

>Subversion Revision: 234321
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 81736d8728bdeed2516020bde36855ba706e6de0..327fcc4a7124285e3b0983aa213dc09607ea2d3f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2018-07-25  Justin Fan  <justin_fan@apple.com>
>+
>+        [WebGL2] Support compilation of GLSL ES version 300 shaders
>+        https://bugs.webkit.org/show_bug.cgi?id=187982
>+        <rdar://problem/42564229>
>+
>+        Reviewed by Dean Jackson.
>+
>+        Test: fast/canvas/webgl/webgl2-glsl3-compile.html
>+
>+        * html/canvas/WebGLRenderingContextBase.cpp:
>+        (WebCore::WebGLRenderingContextBase::create): Rename 'useGLES3' to 'isWebGL2' (everywhere) to make more sense.
>+        * platform/graphics/GraphicsContext3DAttributes.h: Rename 'useGLES3' to 'isWebGL2'.
>+        * platform/graphics/cocoa/GraphicsContext3DCocoa.mm:
>+        (WebCore::setPixelFormat): Back WebGL2 contexts with OpenGL 4 for full OpenGL ES 3 support. 
>+        (WebCore::GraphicsContext3D::GraphicsContext3D): Request correct GLSL output version and WebGL 2 for ANGLE shader compilation.
>+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
>+        (WebCore::GraphicsContext3D::checkVaryingsPacking const): MAX_VARYING_FLOATS is deprecated in OpenGL 3+.
>+        * platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp: Rename 'useGLES3' to 'isWebGL2'.
>+        (WebCore::GraphicsContext3D::create):
>+        (WebCore::GraphicsContext3D::GraphicsContext3D):
>+
> 2018-07-27  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         [WIN] Crash when trying to access store pages
>diff --git a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
>index 19181e44c1335c8e28baaa3f089b71bfd24eee3f..fe8375b0abb1098ab9fc9c4d9dd089f2c8e78430 100644
>--- a/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
>+++ b/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
>@@ -583,7 +583,7 @@ std::unique_ptr<WebGLRenderingContextBase> WebGLRenderingContextBase::create(Can
> 
> #if ENABLE(WEBGL2)
>     if (type == "webgl2")
>-        attributes.useGLES3 = true;
>+        attributes.isWebGL2 = true;
> #endif
> 
>     if (isPendingPolicyResolution) {
>@@ -613,7 +613,7 @@ std::unique_ptr<WebGLRenderingContextBase> WebGLRenderingContextBase::create(Can
> #if ENABLE(WEBGL2) && PLATFORM(MAC)
>     // glTexStorage() was only added to Core in OpenGL 4.2.
>     // However, according to https://developer.apple.com/opengl/capabilities/ all Apple GPUs support this extension.
>-    if (attributes.useGLES3 && !extensions.supports("GL_ARB_texture_storage"))
>+    if (attributes.isWebGL2 && !extensions.supports("GL_ARB_texture_storage"))
>         return nullptr;
> #endif
> 
>diff --git a/Source/WebCore/platform/graphics/GraphicsContext3DAttributes.h b/Source/WebCore/platform/graphics/GraphicsContext3DAttributes.h
>index 0d3da5ed229d96f7e2f056f2339461486c523eb7..32a7bbb18f600080e634bb2a92891bc10bb98b59 100644
>--- a/Source/WebCore/platform/graphics/GraphicsContext3DAttributes.h
>+++ b/Source/WebCore/platform/graphics/GraphicsContext3DAttributes.h
>@@ -48,7 +48,7 @@ struct GraphicsContext3DAttributes {
>     // Additional attributes.
>     bool forceSoftwareRenderer { false };
>     bool shareResources { true };
>-    bool useGLES3 { false };
>+    bool isWebGL2 { false };
>     bool noExtensions { false };
>     float devicePixelRatio { 1 };
>     PowerPreference initialPowerPreference { PowerPreference::Default };
>diff --git a/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm b/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm
>index 959919dba501a3c783c035b3aa0f0e250b642c24..c5071d2c87df45f5d9d0c442cbb8ea3d352a9425 100644
>--- a/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm
>+++ b/Source/WebCore/platform/graphics/cocoa/GraphicsContext3DCocoa.mm
>@@ -81,7 +81,7 @@ public:
> 
> #if USE(OPENGL)
> 
>-static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBits, int depthBits, bool accelerated, bool supersample, bool closest, bool antialias, bool useGLES3, bool allowOfflineRenderers)
>+static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBits, int depthBits, bool accelerated, bool supersample, bool closest, bool antialias, bool isWebGL2, bool allowOfflineRenderers)
> {
>     attribs.clear();
>     
>@@ -118,11 +118,11 @@ static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBi
>         attribs.append(static_cast<CGLPixelFormatAttribute>(4));
>     }
> 
>-    if (useGLES3) {
>-        // FIXME: Instead of backing a WebGL2 GraphicsContext3D with a OpenGL 3.2 context, we should instead back it with ANGLE.
>-        // Use an OpenGL 3.2 context for now until the ANGLE backend is ready.
>+    if (isWebGL2) {
>+        // FIXME: Instead of backing a WebGL2 GraphicsContext3D with a OpenGL 4 context, we should instead back it with ANGLE.
>+        // Use an OpenGL 4 context for now until the ANGLE backend is ready.
>         attribs.append(kCGLPFAOpenGLProfile);
>-        attribs.append(static_cast<CGLPixelFormatAttribute>(kCGLOGLPVersion_3_2_Core));
>+        attribs.append(static_cast<CGLPixelFormatAttribute>(kCGLOGLPVersion_GL4_Core));
>     }
>         
>     attribs.append(static_cast<CGLPixelFormatAttribute>(0));
>@@ -211,14 +211,21 @@ static void identifyAndSetCurrentGPU(PlatformGraphicsContext3D contextObj, CGLPi
> 
> GraphicsContext3D::GraphicsContext3D(GraphicsContext3DAttributes attrs, HostWindow* hostWindow, GraphicsContext3D::RenderStyle, GraphicsContext3D* sharedContext)
>     : m_attrs(attrs)
>-#if PLATFORM(IOS)
>-    , m_compiler(SH_ESSL_OUTPUT)
>-#endif
>     , m_private(std::make_unique<GraphicsContext3DPrivate>(this))
> {
>+#if PLATFORM(IOS)
>+    if (m_attrs.isWebGL2)
>+        m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT, SH_WEBGL2_SPEC);
>+    else
>+        m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT);
>+#else
>+    if (m_attrs.isWebGL2)
>+        m_compiler = ANGLEWebKitBridge(SH_GLSL_410_CORE_OUTPUT, SH_WEBGL2_SPEC);
>+#endif
>+
> #if USE(OPENGL_ES)
>     UNUSED_PARAM(hostWindow);
>-    EAGLRenderingAPI api = m_attrs.useGLES3 ? kEAGLRenderingAPIOpenGLES3 : kEAGLRenderingAPIOpenGLES2;
>+    EAGLRenderingAPI api = m_attrs.isWebGL2 ? kEAGLRenderingAPIOpenGLES3 : kEAGLRenderingAPIOpenGLES2;
>     if (!sharedContext)
>         m_contextObj = [[EAGLContext alloc] initWithAPI:api];
>     else
>@@ -251,19 +258,19 @@ GraphicsContext3D::GraphicsContext3D(GraphicsContext3DAttributes attrs, HostWind
>     m_powerPreferenceUsedForCreation = GraphicsContext3DPowerPreference::Default;
> #endif
> 
>-    setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, true, false, useMultisampling, attrs.useGLES3, allowOfflineRenderers());
>+    setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, true, false, useMultisampling, attrs.isWebGL2, allowOfflineRenderers());
>     CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
> 
>     if (!numPixelFormats) {
>-        setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, false, false, useMultisampling, attrs.useGLES3, allowOfflineRenderers());
>+        setPixelFormat(attribs, 32, 32, !attrs.forceSoftwareRenderer, false, false, useMultisampling, attrs.isWebGL2, allowOfflineRenderers());
>         CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
> 
>         if (!numPixelFormats) {
>-            setPixelFormat(attribs, 32, 16, !attrs.forceSoftwareRenderer, false, false, useMultisampling, attrs.useGLES3, allowOfflineRenderers());
>+            setPixelFormat(attribs, 32, 16, !attrs.forceSoftwareRenderer, false, false, useMultisampling, attrs.isWebGL2, allowOfflineRenderers());
>             CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
> 
>             if (!attrs.forceSoftwareRenderer && !numPixelFormats) {
>-                setPixelFormat(attribs, 32, 16, false, false, true, false, attrs.useGLES3, allowOfflineRenderers());
>+                setPixelFormat(attribs, 32, 16, false, false, true, false, attrs.isWebGL2, allowOfflineRenderers());
>                 CGLChoosePixelFormat(attribs.data(), &pixelFormatObj, &numPixelFormats);
>                 useMultisampling = false;
>             }
>@@ -292,7 +299,7 @@ GraphicsContext3D::GraphicsContext3D(GraphicsContext3DAttributes attrs, HostWind
>         return;
>     }
> 
>-    m_isForWebGL2 = attrs.useGLES3;
>+    m_isForWebGL2 = attrs.isWebGL2;
> 
>     // Set the current context to the one given to us.
>     CGLSetCurrentContext(m_contextObj);
>diff --git a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>index 3437952003ea75be922af6f49dfbefaa79578a13..f41236e00306da0fe7eae0be567e913b8e643b22 100644
>--- a/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>+++ b/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>@@ -400,9 +400,13 @@ bool GraphicsContext3D::checkVaryingsPacking(Platform3DObject vertexShader, Plat
> 
>     GC3Dint maxVaryingVectors = 0;
> #if !USE(OPENGL_ES)
>-    GC3Dint maxVaryingFloats = 0;
>-    ::glGetIntegerv(GL_MAX_VARYING_FLOATS, &maxVaryingFloats);
>-    maxVaryingVectors = maxVaryingFloats / 4;
>+    if (m_isForWebGL2)
>+        ::glGetIntegerv(GL_MAX_VARYING_VECTORS, &maxVaryingVectors);
>+    else {
>+        GC3Dint maxVaryingFloats = 0;
>+        ::glGetIntegerv(GL_MAX_VARYING_FLOATS, &maxVaryingFloats);
>+        maxVaryingVectors = maxVaryingFloats / 4;
>+    }
> #else
>     ::glGetIntegerv(MAX_VARYING_VECTORS, &maxVaryingVectors);
> #endif
>diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp b/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>index 0c083deb6bcb698eaa402fa455b79087f14bb79a..a026e8cbbaab6af64d4fd0c5f7891998268e9b02 100644
>--- a/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>+++ b/Source/WebCore/platform/graphics/texmap/GraphicsContext3DTextureMapper.cpp
>@@ -93,7 +93,7 @@ RefPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3DAttributes
> 
> #if USE(LIBEPOXY) && USE(OPENGL_ES)
>     // Bail if GLES3 was requested but cannot be provided.
>-    if (attributes.useGLES3 && !epoxy_is_desktop_gl() && epoxy_gl_version() < 30)
>+    if (attributes.isWebGL2 && !epoxy_is_desktop_gl() && epoxy_gl_version() < 30)
>         return nullptr;
> #endif
> 
>@@ -195,7 +195,7 @@ GraphicsContext3D::GraphicsContext3D(GraphicsContext3DAttributes attributes, Hos
>     }
> #else
>     // Adjust the shader specification depending on whether GLES3 (i.e. WebGL2 support) was requested.
>-    m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT, m_attrs.useGLES3 ? SH_WEBGL2_SPEC : SH_WEBGL_SPEC);
>+    m_compiler = ANGLEWebKitBridge(SH_ESSL_OUTPUT, m_attrs.isWebGL2 ? SH_WEBGL2_SPEC : SH_WEBGL_SPEC);
> #endif
> 
>     // ANGLE initialization.
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index d7be204be1bea8b397ee7655e80b776557d329ed..56f598cab4263c0d5467fcee0c063c768a22f9e3 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-07-25  Justin Fan  <justin_fan@apple.com>
>+
>+        [WebGL2] Support compilation of GLSL ES version 300 shaders
>+        https://bugs.webkit.org/show_bug.cgi?id=187982
>+        <rdar://problem/42564229>
>+
>+        Reviewed by Dean Jackson.
>+
>+        New simple test added to ensure that GLSL ES version 300 shaders compile.
>+        Updated other test results in glsl3 to match new functionality.
>+
>+        * fast/canvas/webgl/webgl2-glsl3-compile-expected.txt: Added.
>+        * fast/canvas/webgl/webgl2-glsl3-compile.html: Added.
>+        * platform/ios-simulator-wk2/TestExpectations: Skipping ios-sim for now. 
>+        * webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt:
>+        * webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt:
>+
> 2018-07-27  Basuke Suzuki  <Basuke.Suzuki@sony.com>
> 
>         [Curl] Crash on synchronous request via ResourceHandle.
>diff --git a/LayoutTests/fast/canvas/webgl/webgl2-glsl3-compile-expected.txt b/LayoutTests/fast/canvas/webgl/webgl2-glsl3-compile-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..d636bacaa95b4ba7605c352c93827b17b887b5c5
>--- /dev/null
>+++ b/LayoutTests/fast/canvas/webgl/webgl2-glsl3-compile-expected.txt
>@@ -0,0 +1,12 @@
>+Make sure that compiling GLSL ES 3 shaders works as expected.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+PASS success is true
>+PASS success is true
>+PASS success is true
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/fast/canvas/webgl/webgl2-glsl3-compile.html b/LayoutTests/fast/canvas/webgl/webgl2-glsl3-compile.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..18a42d0706388f1e3d6912a6d39ea13235911065
>--- /dev/null
>+++ b/LayoutTests/fast/canvas/webgl/webgl2-glsl3-compile.html
>@@ -0,0 +1,76 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<script src="../../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<canvas id="canvas" width="40" height="40"></canvas>
>+
>+<script>
>+var success = false;
>+function compileShader(gl, shaderSource, shaderType) {
>+    var shader = gl.createShader(shaderType);
>+
>+    gl.shaderSource(shader, shaderSource);
>+
>+    gl.compileShader(shader);
>+
>+    success = gl.getShaderParameter(shader, gl.COMPILE_STATUS);
>+
>+    shouldBe("success", "true");
>+
>+    return shader;
>+}
>+
>+function createProgram(gl, vertexShader, fragmentShader) {
>+    var program = gl.createProgram();
>+
>+    gl.attachShader(program, vertexShader);
>+    gl.attachShader(program, fragmentShader);
>+
>+    gl.linkProgram(program);
>+
>+    success = gl.getProgramParameter(program, gl.LINK_STATUS);
>+
>+    shouldBe("success", "true");
>+
>+    return program;
>+}
>+
>+description("Make sure that compiling GLSL ES 3 shaders works as expected.");
>+
>+if (window.internals)
>+    internals.settings.setWebGL2Enabled(true);
>+
>+var vertexShaderSource = `#version 300 es
>+layout(location = 0) in vec2 pos;
>+
>+void main()
>+{
>+    gl_Position = vec4(pos, 0.0, 1.0);
>+}
>+`;
>+
>+var fragmentShaderSource = `#version 300 es
>+precision mediump float;
>+out vec4 color;
>+
>+void main()
>+{
>+    color = vec4(1.0, 0.5, 0.0, 1.0);
>+}
>+`;
>+    
>+var canvas = document.getElementById("canvas");
>+var gl = canvas.getContext("webgl2");
>+
>+var vertexShader = compileShader(gl, vertexShaderSource, gl.VERTEX_SHADER);
>+var fragmentShader = compileShader(gl, fragmentShaderSource, gl.FRAGMENT_SHADER);
>+
>+var program = createProgram(gl, vertexShader, fragmentShader);
>+
>+</script>
>+<script src="../../../resources/js-test-post.js"></script>
>+</body>
>+</html>
>+
>diff --git a/LayoutTests/platform/ios-simulator-wk2/TestExpectations b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>index 60b3345e6532c308c58930d9dc2790c47533358e..ea2d3e46dab4365dd84302bc4a9b7b94bdef7fd4 100644
>--- a/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>+++ b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
>@@ -45,4 +45,5 @@ webkit.org/b/187699 [ Debug ] fast/forms/submit-change-fragment.html [ Pass Time
> 
> webkit.org/b/188017 [ Release ] media/audio-concurrent-supported.html [ Pass Failure ]
> 
>-
>+# We are only accepting GLSL3 for macOS. 
>+webkit.org/b/187982 webgl/2.0.0/conformance2/glsl3 [ Skip ]
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt
>index a3d0f376a26b5639d59ef714fe84ef229f53f676..ffcb2828ef27124c5275348be2ddcf6c560b600b 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/compound-assignment-type-combination.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt
>index 032a34ed54afb1815f0d9d06063df16f66e3106f..8f9539aaebb385c14dbcb32df5968a978cdf6662 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/forbidden-operators-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/forbidden-operators.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt
>index 0d3d8bf3c47e534b36632338c773505a0a6f6184..ac2f3bae2f855a25a42f02b4142f76498f9c8600 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-default-precision-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/invalid-default-precision.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt
>index 1776b32285923fa5ce319ac529f0796db30c428e..83864227e0705f5bcee167ca9d45876e7ba01dff 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/invalid-invariant-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/invalid-invariant.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt
>index 35044b5bebe3486f23c25d200d1681f775207e56..8a2f466bbf0a1dac0a51dd7c010939a05390df12 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/misplaced-version-directive-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/misplaced-version-directive.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt
>index 78c89c0cefad08efa44f758961c49e1aa1261103..60a7e899814cd1a5ed1ea0d80c908032f16544bc 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/sampler-no-precision-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/sampler-no-precision.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt
>index 34021cb32e5f27b51fdb2a5e2ad7b4b463f3d689..f43dc64a5c7d000dfd8dce95280af402c8ac0bc4 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/sequence-operator-returns-non-constant-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/sequence-operator-returns-non-constant.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt
>index 2a86a47c3810be622627254ce7b574534ab2a3b4..0620f70be862b635e6f761c2a52fc105e041acf5 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-out-of-range-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/texture-offset-out-of-range.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt
>index 15ce031b2dc4eabd0c7480cfaed838e2cafd9392..ad4dc495700f82cf220e6229816c1b28d93f27ea 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/texture-offset-uniform-texture-coordinate.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt
>index ffd885258344b16fa61f08c41b7d0480bc5d824b..a5fbe844179113cfe94604292e4fcdf1a5eddab2 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layout-match-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/uniform-block-layout-match.html
>-FAIL
>+PASS
> 
>diff --git a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt
>index cb2b8d68d6f9fa1f394dd20e991cf41bf3df0781..a93e2a9af3eec52e8ca85843c0d7b47e15129b7d 100644
>--- a/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt
>+++ b/LayoutTests/webgl/2.0.0/conformance2/glsl3/uniform-block-layouts-expected.txt
>@@ -1,5 +1,5 @@
> This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
> 
> Test: ../../resources/webgl_test_files/conformance2/glsl3/uniform-block-layouts.html
>-FAIL
>+PASS
>

Actions: View | Formatted Diff | Diff

Attachments on bug 187982: 345732 | 345736 | 345738 | 345740 | 345741 | 345805 | 345811 | 345907 | 345942 | 345973 | 345987 | 346005 | 346084