Commit d36daf87 authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot

Roll WebGL 5e57726..72eda82

https://chromium.googlesource.com/external/khronosgroup/webgl.git/+log/5e57726..72eda82

BUG=733599, 735483, angleproject:2103
TEST=bots
TBR=zmo@chromium.org

CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel

Change-Id: I4542a243a3b34141becea64e1f024872f64c3ce2
Reviewed-on: https://chromium-review.googlesource.com/570761
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486889}
parent 12ed4123
...@@ -199,7 +199,7 @@ deps = { ...@@ -199,7 +199,7 @@ deps = {
Var('chromium_git') + '/external/bidichecker/lib.git' + '@' + '97f2aa645b74c28c57eca56992235c79850fa9e0', Var('chromium_git') + '/external/bidichecker/lib.git' + '@' + '97f2aa645b74c28c57eca56992235c79850fa9e0',
'src/third_party/webgl/src': 'src/third_party/webgl/src':
Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '5e57726d6fe2833c957b5a33cd0aed19d67a4fa9', Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '72eda82d069da578af04e5c4e8e411ae006b6a18',
'src/third_party/webdriver/pylib': 'src/third_party/webdriver/pylib':
Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd', Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd',
......
...@@ -63,6 +63,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations): ...@@ -63,6 +63,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
bug=1966) # angle bug ID bug=1966) # angle bug ID
# Windows only. # Windows only.
self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html',
['win'], bug=2103) # angle bug ID
self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html', self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html',
['win', 'd3d11'], bug=644740) ['win', 'd3d11'], bug=644740)
self.Fail('conformance2/textures/misc/tex-base-level-bug.html', self.Fail('conformance2/textures/misc/tex-base-level-bug.html',
...@@ -70,6 +72,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations): ...@@ -70,6 +72,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
self.Flaky('conformance2/textures/svg_image/' + self.Flaky('conformance2/textures/svg_image/' +
'tex-2d-rgb565-rgb-unsigned_short_5_6_5.html', 'tex-2d-rgb565-rgb-unsigned_short_5_6_5.html',
['win'], bug=736926) ['win'], bug=736926)
self.Fail('conformance2/uniforms/uniform-blocks-with-arrays.html',
['win'], bug=2103) # angle bug ID
# Win / NVidia # Win / NVidia
self.Flaky('deqp/functional/gles3/fbomultisample*', self.Flaky('deqp/functional/gles3/fbomultisample*',
...@@ -382,6 +386,10 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations): ...@@ -382,6 +386,10 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
['mac', ('nvidia', 0xfe9)], bug=654187) ['mac', ('nvidia', 0xfe9)], bug=654187)
# Mac AMD # Mac AMD
self.Fail('conformance/rendering/texture-switch-performance.html',
['mac', 'amd'], bug=735483)
self.Fail('conformance2/rendering/texture-switch-performance.html',
['mac', 'amd'], bug=735483)
self.Fail('deqp/functional/gles3/transformfeedback/' + self.Fail('deqp/functional/gles3/transformfeedback/' +
'array_interleaved_lines.html', 'array_interleaved_lines.html',
['mac', 'amd'], bug=483282) ['mac', 'amd'], bug=483282)
...@@ -587,6 +595,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations): ...@@ -587,6 +595,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
['linux', 'nvidia'], bug=679677) ['linux', 'nvidia'], bug=679677)
self.Fail('conformance2/rendering/framebuffer-texture-level1.html', self.Fail('conformance2/rendering/framebuffer-texture-level1.html',
['linux', 'nvidia', 'opengl'], bug=680278) ['linux', 'nvidia', 'opengl'], bug=680278)
self.Fail('conformance2/rendering/multisampling-fragment-evaluation.html',
['linux', 'nvidia', 'no_passthrough'], bug=682815)
self.Fail('conformance2/textures/image/' + self.Fail('conformance2/textures/image/' +
'tex-3d-rg8ui-rg_integer-unsigned_byte.html', 'tex-3d-rg8ui-rg_integer-unsigned_byte.html',
['linux', ('nvidia', 0xf02)], bug=680282) ['linux', ('nvidia', 0xf02)], bug=680282)
......
...@@ -195,6 +195,9 @@ class WebGLConformanceExpectations(GpuTestExpectations): ...@@ -195,6 +195,9 @@ class WebGLConformanceExpectations(GpuTestExpectations):
['win', 'nvidia', 'passthrough', 'd3d11'], bug=737016) ['win', 'nvidia', 'passthrough', 'd3d11'], bug=737016)
# Win failures # Win failures
# TODO(kbr): re-enable suppression for same test below once fixed.
self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html',
['win'], bug=2103) # angle bug ID
# Note that the following test seems to pass, but it may still be flaky. # Note that the following test seems to pass, but it may still be flaky.
self.Fail('conformance/glsl/constructors/' + self.Fail('conformance/glsl/constructors/' +
'glsl-construct-vec-mat-index.html', 'glsl-construct-vec-mat-index.html',
...@@ -314,8 +317,8 @@ class WebGLConformanceExpectations(GpuTestExpectations): ...@@ -314,8 +317,8 @@ class WebGLConformanceExpectations(GpuTestExpectations):
['win', 'intel', 'opengl'], bug=1007) # angle bug ID ['win', 'intel', 'opengl'], bug=1007) # angle bug ID
self.Fail('conformance/uniforms/uniform-default-values.html', self.Fail('conformance/uniforms/uniform-default-values.html',
['win', 'intel', 'opengl'], bug=1007) # angle bug ID ['win', 'intel', 'opengl'], bug=1007) # angle bug ID
self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html', # self.Fail('conformance/glsl/bugs/sampler-struct-function-arg.html',
['win10', 'intel', 'opengl'], bug=1007) # angle bug ID # ['win10', 'intel', 'opengl'], bug=1007) # angle bug ID
self.Fail('conformance/glsl/variables/gl-pointcoord.html', self.Fail('conformance/glsl/variables/gl-pointcoord.html',
['win10', 'intel', 'opengl'], bug=1007) # angle bug ID ['win10', 'intel', 'opengl'], bug=1007) # angle bug ID
...@@ -376,6 +379,8 @@ class WebGLConformanceExpectations(GpuTestExpectations): ...@@ -376,6 +379,8 @@ class WebGLConformanceExpectations(GpuTestExpectations):
['mac', 'amd', 'no_passthrough'], bug=625365) ['mac', 'amd', 'no_passthrough'], bug=625365)
self.Fail('conformance/rendering/clipping-wide-points.html', self.Fail('conformance/rendering/clipping-wide-points.html',
['mac', 'amd'], bug=642822) ['mac', 'amd'], bug=642822)
self.Fail('conformance/rendering/texture-switch-performance.html',
['mac', 'amd'], bug=735483)
# Mac Retina NVidia failures # Mac Retina NVidia failures
self.Fail('conformance/attribs/gl-disabled-vertex-attrib.html', self.Fail('conformance/attribs/gl-disabled-vertex-attrib.html',
...@@ -468,6 +473,16 @@ class WebGLConformanceExpectations(GpuTestExpectations): ...@@ -468,6 +473,16 @@ class WebGLConformanceExpectations(GpuTestExpectations):
self.Skip('conformance/textures/misc/texture-npot-video.html', self.Skip('conformance/textures/misc/texture-npot-video.html',
['android', 'android-webview-instrumentation', 'no_passthrough'], ['android', 'android-webview-instrumentation', 'no_passthrough'],
bug=352645) bug=352645)
# New video-to-luminance-alpha tests are failing on Android right now.
self.Fail('conformance/textures/video/' +
'tex-2d-alpha-alpha-unsigned_byte.html',
['android'], bug=733599)
self.Fail('conformance/textures/video/' +
'tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html',
['android'], bug=733599)
self.Fail('conformance/textures/video/' +
'tex-2d-luminance-luminance-unsigned_byte.html',
['android'], bug=733599)
# This crashes in Android WebView on the Nexus 6, preventing the # This crashes in Android WebView on the Nexus 6, preventing the
# suite from running further. Rather than add multiple # suite from running further. Rather than add multiple
# suppressions, skip it until it's passing at least in content # suppressions, skip it until it's passing at least in content
......
# AUTOGENERATED FILE - DO NOT EDIT # AUTOGENERATED FILE - DO NOT EDIT
# SEE roll_webgl_conformance.py # SEE roll_webgl_conformance.py
Current webgl revision 5e57726d6fe2833c957b5a33cd0aed19d67a4fa9 Current webgl revision 72eda82d069da578af04e5c4e8e411ae006b6a18
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment