Roll WebGL 6f0b34a..91350f8
https://chromium.googlesource.com/external/khronosgroup/webgl.git/+log/6f0b34a..91350f8
Bug: 763695, 949249, 953120, 958374
Bug: 961658, 979843, 980675
Bug: angleproject:1293, angleproject:3285, angleproject:3388, angleproject:3557
Cq-Include-Trybots: luci.chromium.try:win_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux-angle-rel;luci.chromium.try:win-angle-rel
Change-Id: I8e059ffc931e088176083e58351178b388feb56f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1684376
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#674292}
diff --git a/DEPS b/DEPS
index 51f9330..61ded37 100644
--- a/DEPS
+++ b/DEPS
@@ -1356,7 +1356,7 @@
Var('chromium_git') + '/external/github.com/SeleniumHQ/selenium/py.git' + '@' + 'd0045ec570c1a77612db35d1e92f05e1d27b4d53',
'src/third_party/webgl/src':
- Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '6f0b34abee8dba611c253738d955c59f703c147a',
+ Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '91350f8ecf9ab2922ee062c114e4a759f24bd8d0',
'src/third_party/webrtc':
Var('webrtc_git') + '/src.git' + '@' + '02d7d353a90bccc6fdd0e517af31fab50944d31c',
diff --git a/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
index 2322a9ed..a0d2c24 100644
--- a/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
@@ -47,17 +47,18 @@
# Conformance expectations
# ========================
+# Recent regression of invariance rules
+# TODO(kbr): re-add suppressions below once this is removed.
+crbug.com/980675 conformance/glsl/misc/shaders-with-invariance.html [ Failure ]
+
+crbug.com/953120 conformance/programs/program-handling.html [ Failure ]
+# TODO(kbr): restore suppression for Android / Qualcomm below after this is fixed.
+crbug.com/949249 conformance2/extensions/ovr_multiview2.html [ Failure ]
+
# Failing new test
crbug.com/874620 [ linux nvidia ] conformance2/glsl3/const-struct-from-array-as-function-parameter.html [ Failure ]
crbug.com/874620 [ opengl win nvidia ] conformance2/glsl3/const-struct-from-array-as-function-parameter.html [ Failure ]
-# Unsuppress after both
-# https://chromium-review.googlesource.com/1558678 and
-# https://github.com/KhronosGroup/WebGL/pull/2878 land and are rolled
-# in.
-# TODO(kbr): this is actually crbug.com/angleproject/3285 .
-crbug.com/angleproject/3285 conformance/glsl/misc/shaders-with-invariance.html [ Failure ]
-
# Too slow (take about one hour to run)
crbug.com/619403 deqp/functional/gles3/builtinprecision/* [ Skip ]
@@ -91,6 +92,9 @@
crbug.com/angleproject/1465 [ win ] conformance2/glsl3/tricky-loop-conditions.html [ Failure ]
crbug.com/951628 [ win no-passthrough ] conformance/rendering/blending.html [ Failure ]
+# Win / D3D11 backend
+crbug.com/angleproject/3388 [ win d3d11 ] conformance2/uniforms/large-uniform-buffers.html [ Failure ]
+
# Win / NVidia
crbug.com/631317 [ d3d11 win nvidia ] deqp/functional/gles3/fbomultisample* [ RetryOnFailure ]
crbug.com/679639 [ d3d11 win nvidia ] conformance2/rendering/draw-with-integer-texture-base-level.html [ Failure ]
@@ -739,7 +743,8 @@
# Qualcomm (Pixel 2) failures
crbug.com/906737 [ android qualcomm ] conformance/extensions/webgl-compressed-texture-astc.html [ Failure ]
-crbug.com/906739 [ android qualcomm ] conformance2/extensions/ovr_multiview2.html [ Failure ]
+# TODO(kbr): uncomment after http://crbug.com/949249 fixed
+# crbug.com/906739 [ android qualcomm ] conformance2/extensions/ovr_multiview2.html [ Failure ]
crbug.com/906742 [ android qualcomm ] conformance2/glsl3/compare-structs-containing-arrays.html [ Failure ]
crbug.com/906735 [ android qualcomm ] conformance2/textures/video/tex-2d-rgba8ui-rgba_integer-unsigned_byte.html [ Failure ]
crbug.com/949321 [ android qualcomm ] deqp/functional/gles3/framebufferblit/default_framebuffer_02.html [ RetryOnFailure ]
diff --git a/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt
index d039bae9..9d6a10d5 100644
--- a/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt
+++ b/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt
@@ -66,12 +66,9 @@
# https://github.com/KhronosGroup/WebGL/pull/2607
crbug.com/849572 conformance/extensions/angle-instanced-arrays-out-of-bounds.html [ Failure ]
-# Unsuppress after both
-# https://chromium-review.googlesource.com/1558678 and
-# https://github.com/KhronosGroup/WebGL/pull/2878 land and are rolled
-# in.
-# TODO(kbr): this is actually crbug.com/angleproject/3285 .
-crbug.com/angleproject/3285 conformance/glsl/misc/shaders-with-invariance.html [ Failure ]
+# Recent regression of invariance rules
+# TODO(kbr): re-add suppressions below once this is removed.
+crbug.com/980675 conformance/glsl/misc/shaders-with-invariance.html [ Failure ]
# Nvidia bugs fixed in latest driver
# TODO(http://crbug.com/887241): Upgrade the drivers on the bots.
@@ -88,6 +85,7 @@
crbug.com/735483 conformance/rendering/texture-switch-performance.html [ Skip ]
crbug.com/951628 [ passthrough ] conformance/rendering/blending.html [ Failure ]
+crbug.com/953120 conformance/programs/program-handling.html [ Failure ]
# TODO(shrekshao): Restore failure expectation for
# ['win', 'nvidia', 'passthrough', 'd3d11'], bug=737016
# as Flaky after 953120 is fixed.
diff --git a/content/test/gpu/gpu_tests/webgl_conformance_revision.txt b/content/test/gpu/gpu_tests/webgl_conformance_revision.txt
index 799efd0e..26c974a 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance_revision.txt
+++ b/content/test/gpu/gpu_tests/webgl_conformance_revision.txt
@@ -1,3 +1,3 @@
# AUTOGENERATED FILE - DO NOT EDIT
# SEE roll_webgl_conformance.py
-Current webgl revision 6f0b34abee8dba611c253738d955c59f703c147a
+Current webgl revision 91350f8ecf9ab2922ee062c114e4a759f24bd8d0