Skip to content

Commit

Permalink
Roll WebGL e4919fa..05591bb
Browse files Browse the repository at this point in the history
https://chromium.googlesource.com/external/khronosgroup/webgl.git/+log/e4919fa..05591bb

BUG=782317

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

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ib9d1d373b8942214cf655d6aa132dddd233229a0
Reviewed-on: https://chromium-review.googlesource.com/802696
Reviewed-by: Yunchao He <yunchao.he@intel.com>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520976}
  • Loading branch information
JiangYizhou authored and Commit Bot committed Dec 1, 2017
1 parent 08e200f commit 9232922
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ deps = {
Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd',

'src/third_party/webgl/src':
Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'e4919fa03c74bd561dcabf3e61668fa3c7e54353',
Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '05591bbeae6592fd924caec8e728a4ea86cbb8c9',

'src/third_party/webrtc':
Var('webrtc_git') + '/src.git' + '@' + '4e70a72571dd26b85c2385e9c618e343428df5d3', # commit position 20628
Expand Down
7 changes: 7 additions & 0 deletions content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,10 @@ def SetExpectations(self):
self.Fail('deqp/functional/gles3/integerstatequery.html',
['passthrough', 'opengl'], bug=602688)

# Win / Intel
self.Fail('conformance/rendering/rendering-stencil-large-viewport.html',
['win', 'intel', 'd3d11'], bug=782317)

# Passthrough command decoder / OpenGL / Intel
self.Fail('conformance2/textures/video/tex-2d-rgb32f-rgb-float.html',
['passthrough', 'opengl', 'intel'], bug=602688)
Expand Down Expand Up @@ -696,6 +700,9 @@ def SetExpectations(self):
'multisampled-depth-renderbuffer-initialization.html',
['mac', 'intel'], bug=731877)

self.Fail('conformance/rendering/rendering-stencil-large-viewport.html',
['mac', 'intel'], bug=782317)

# Linux only.
self.Flaky('conformance/textures/video/' +
'tex-2d-rgba-rgba-unsigned_byte.html',
Expand Down
2 changes: 1 addition & 1 deletion content/test/gpu/gpu_tests/webgl_conformance_revision.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# AUTOGENERATED FILE - DO NOT EDIT
# SEE roll_webgl_conformance.py
Current webgl revision e4919fa03c74bd561dcabf3e61668fa3c7e54353
Current webgl revision 05591bbeae6592fd924caec8e728a4ea86cbb8c9

0 comments on commit 9232922

Please sign in to comment.