summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkbr <kbr@chromium.org>2015-11-23 14:25:03 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-23 22:26:54 +0000
commit1f6b87138b7ce6cbe2cb44bb3ed4bb210cceb622 (patch)
tree0c52b83342566b9b60a3a72d01f321879ebd2726
parent2c777f1149c46c47eaa3307a38070c82eff93835 (diff)
downloadchromium_src-1f6b87138b7ce6cbe2cb44bb3ed4bb210cceb622.zip
chromium_src-1f6b87138b7ce6cbe2cb44bb3ed4bb210cceb622.tar.gz
chromium_src-1f6b87138b7ce6cbe2cb44bb3ed4bb210cceb622.tar.bz2
Suppress new WebGL 2.0 conformance failures.
BUG=295792 TBR=zmo@chromium.org,jmadill@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/1469173002 Cr-Commit-Position: refs/heads/master@{#361202}
-rw-r--r--content/test/gpu/gpu_tests/webgl2_conformance_expectations.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
index be21fc5..10be4de 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -83,6 +83,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
self.Fail('conformance2/glsl3/invalid-default-precision.html', bug=483282)
self.Fail('conformance2/glsl3/sequence-operator-returns-non-constant.html',
bug=483282)
+ self.Fail('conformance2/extensions/promoted-extensions-in-shaders.html',
+ bug=295792)
self.Fail('conformance2/reading/read-pixels-into-pixel-pack-buffer.html',
bug=483282)
self.Fail('conformance2/renderbuffers/framebuffer-test.html', bug=483282)
@@ -92,6 +94,8 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
self.Skip('conformance2/textures/webgl_canvas/*', bug=483282)
self.Fail('conformance2/textures/misc/tex-mipmap-levels.html', bug=483282)
self.Fail('conformance2/textures/misc/tex-storage-2d.html', bug=483282)
+ self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html',
+ bug=295792)
# Windows only.
self.Skip('deqp/functional/gles3/readpixel.html', ['win'], bug=483282)
@@ -184,8 +188,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
self.Fail('conformance2/textures/video/*', ['mac'], bug=483282)
self.Fail('conformance2/textures/misc/gl-get-tex-parameter.html',
['mac'], bug=483282)
- self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html',
- ['mac'], bug=483282)
self.Fail('conformance2/textures/misc/texture-npot.html',
['mac'], bug=483282)
@@ -215,8 +217,9 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
['linux', 'amd'], bug=483282)
self.Fail('conformance2/buffers/buffer-overflow-test.html',
['linux', 'amd'], bug=483282)
- self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html',
- ['linux', 'amd'], bug=483282)
+ self.Fail('conformance2/renderbuffers/framebuffer-texture-layer.html',
+ ['linux', 'amd'], bug=295792)
+
# Conflicting expectations to test that the
# "Expectations Have No collisions" unittest works.