Skip to content

Commit

Permalink
Roll WebGL 1db74f6..4e6c509
Browse files Browse the repository at this point in the history
https://chromium.googlesource.com/external/khronosgroup/webgl.git/+log/1db74f6..4e6c509

BUG=655836

TEST=bots

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

Review-Url: https://codereview.chromium.org/2416783007
Cr-Commit-Position: refs/heads/master@{#425541}
  • Loading branch information
kainino0x authored and Commit bot committed Oct 15, 2016
1 parent a22a11e commit 0c6d81d
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ deps = {
Var('chromium_git') + '/external/bidichecker/lib.git' + '@' + '97f2aa645b74c28c57eca56992235c79850fa9e0',

'src/third_party/webgl/src':
Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '1db74f63016a90bc696e050712a2bd515eae49fc',
Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '4e6c509',

'src/third_party/webdriver/pylib':
Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd',
Expand Down
28 changes: 26 additions & 2 deletions content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,34 @@ def SetExpectations(self):

# All platforms.
self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
self.Fail('conformance/buffers/buffer-uninitialized.html',
bug=654201)
self.Fail('conformance2/transform_feedback/transform_feedback.html',
bug=654201)
self.Fail('conformance2/context/constants-and-properties-2.html',
bug=655836)
self.Fail('conformance/extensions/webgl-compressed-texture-etc.html',
bug=655836)
self.Fail('conformance/extensions/webgl-compressed-texture-pvrtc.html',
bug=655836)
self.Fail('conformance/extensions/webgl-compressed-texture-atc.html',
bug=655836)
self.Fail('conformance/extensions/webgl-compressed-texture-s3tc.html',
bug=655836)
self.Fail('conformance/extensions/webgl-compressed-texture-s3tc-srgb.html',
bug=655836)
self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html',
bug=655836)
self.Fail('deqp/functional/gles3/integerstatequery.html', bug=655836)
self.Fail('deqp/functional/gles3/negativetextureapi.html',
['win', 'mac'], bug=655836)
self.Fail('deqp/functional/gles3/textureformat/*', bug=655836)
self.Fail('deqp/functional/gles3/texturewrap/*', bug=655836)
self.Fail('deqp/functional/gles3/texturewrap.html', bug=655836)

# Windows only.
# We are awesome!
self.Fail('conformance2/buffers/getBufferSubData.html',
self.Fail('conformance2/buffers/get-buffer-sub-data.html',
['win'], bug=654201)

# Win / NVidia
Expand Down Expand Up @@ -504,7 +528,7 @@ def SetExpectations(self):
['mac', 'intel'], bug=483282)

# Linux only.
self.Fail('conformance2/buffers/getBufferSubData.html',
self.Fail('conformance2/buffers/get-buffer-sub-data.html',
['linux'], bug=654201)

self.Flaky('conformance/textures/video/' +
Expand Down
3 changes: 3 additions & 0 deletions content/test/gpu/gpu_tests/webgl_conformance_expectations.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ def SetExpectations(self):
# ========================
# Fails on all platforms

self.Fail('conformance/buffers/buffer-uninitialized.html',
bug=654201)

# We need to add WebGL 1 check in command buffer that format/type from
# TexSubImage2D have to match the current texture's.
self.Fail('conformance/textures/misc/tex-sub-image-2d-bad-args.html',
Expand Down

0 comments on commit 0c6d81d

Please sign in to comment.