| OLD | NEW | 
|---|
| 1 # Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2015 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 from gpu_tests.webgl_conformance_expectations import WebGLConformanceExpectation
     s | 4 from gpu_tests.webgl_conformance_expectations import WebGLConformanceExpectation
     s | 
| 5 | 5 | 
| 6 # See the GpuTestExpectations class for documentation. | 6 # See the GpuTestExpectations class for documentation. | 
| 7 | 7 | 
| 8 class WebGL2ConformanceExpectations(WebGLConformanceExpectations): | 8 class WebGL2ConformanceExpectations(WebGLConformanceExpectations): | 
| 9   def __init__(self, conformance_path): | 9   def __init__(self, conformance_path): | 
| 10     super(WebGL2ConformanceExpectations, self).__init__(conformance_path) | 10     super(WebGL2ConformanceExpectations, self).__init__(conformance_path) | 
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 76     self.Skip('deqp/functional/gles3/uniformapi.html', bug=483282) | 76     self.Skip('deqp/functional/gles3/uniformapi.html', bug=483282) | 
| 77     self.Skip('deqp/functional/gles3/uniformbuffers.html', bug=483282) | 77     self.Skip('deqp/functional/gles3/uniformbuffers.html', bug=483282) | 
| 78     self.Skip('deqp/functional/gles3/vertexarrays.html', bug=483282) | 78     self.Skip('deqp/functional/gles3/vertexarrays.html', bug=483282) | 
| 79 | 79 | 
| 80     self.Fail('conformance2/buffers/uniform-buffers.html', bug=483282) | 80     self.Fail('conformance2/buffers/uniform-buffers.html', bug=483282) | 
| 81     self.Fail('conformance2/glsl3/array-complex-indexing.html', bug=483282) | 81     self.Fail('conformance2/glsl3/array-complex-indexing.html', bug=483282) | 
| 82     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282) | 82     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282) | 
| 83     self.Fail('conformance2/glsl3/invalid-default-precision.html', bug=483282) | 83     self.Fail('conformance2/glsl3/invalid-default-precision.html', bug=483282) | 
| 84     self.Fail('conformance2/glsl3/sequence-operator-returns-non-constant.html', | 84     self.Fail('conformance2/glsl3/sequence-operator-returns-non-constant.html', | 
| 85         bug=483282) | 85         bug=483282) | 
|  | 86     self.Fail('conformance2/extensions/promoted-extensions-in-shaders.html', | 
|  | 87         bug=295792) | 
| 86     self.Fail('conformance2/reading/read-pixels-into-pixel-pack-buffer.html', | 88     self.Fail('conformance2/reading/read-pixels-into-pixel-pack-buffer.html', | 
| 87         bug=483282) | 89         bug=483282) | 
| 88     self.Fail('conformance2/renderbuffers/framebuffer-test.html', bug=483282) | 90     self.Fail('conformance2/renderbuffers/framebuffer-test.html', bug=483282) | 
| 89     self.Fail('conformance2/renderbuffers/invalidate-framebuffer.html', | 91     self.Fail('conformance2/renderbuffers/invalidate-framebuffer.html', | 
| 90         bug=483282) | 92         bug=483282) | 
| 91     self.Fail('conformance2/samplers/sampler-drawing-test.html', bug=483282) | 93     self.Fail('conformance2/samplers/sampler-drawing-test.html', bug=483282) | 
| 92     self.Skip('conformance2/textures/webgl_canvas/*', bug=483282) | 94     self.Skip('conformance2/textures/webgl_canvas/*', bug=483282) | 
| 93     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html', bug=483282) | 95     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html', bug=483282) | 
| 94     self.Fail('conformance2/textures/misc/tex-storage-2d.html', bug=483282) | 96     self.Fail('conformance2/textures/misc/tex-storage-2d.html', bug=483282) | 
|  | 97     self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html', | 
|  | 98         bug=295792) | 
| 95 | 99 | 
| 96     # Windows only. | 100     # Windows only. | 
| 97     self.Skip('deqp/functional/gles3/readpixel.html', ['win'], bug=483282) | 101     self.Skip('deqp/functional/gles3/readpixel.html', ['win'], bug=483282) | 
| 98     self.Skip('deqp/functional/gles3/texturestatequery.html', | 102     self.Skip('deqp/functional/gles3/texturestatequery.html', | 
| 99         ['win'], bug=483282) | 103         ['win'], bug=483282) | 
| 100     self.Fail('conformance2/glsl3/array-in-complex-expression.html', | 104     self.Fail('conformance2/glsl3/array-in-complex-expression.html', | 
| 101         ['win'], bug=483282) | 105         ['win'], bug=483282) | 
| 102     self.Fail('conformance2/glsl3/frag-depth.html', | 106     self.Fail('conformance2/glsl3/frag-depth.html', | 
| 103         ['win'], bug=483282) | 107         ['win'], bug=483282) | 
| 104     self.Fail('conformance2/glsl3/short-circuiting-in-loop-condition.html', | 108     self.Fail('conformance2/glsl3/short-circuiting-in-loop-condition.html', | 
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 177     self.Fail('conformance2/rendering/instanced-arrays.html', | 181     self.Fail('conformance2/rendering/instanced-arrays.html', | 
| 178         ['mac'], bug=483282) | 182         ['mac'], bug=483282) | 
| 179     self.Fail('conformance2/samplers/samplers.html', | 183     self.Fail('conformance2/samplers/samplers.html', | 
| 180         ['mac'], bug=483282) | 184         ['mac'], bug=483282) | 
| 181     self.Fail('conformance2/state/gl-object-get-calls.html', | 185     self.Fail('conformance2/state/gl-object-get-calls.html', | 
| 182         ['mac'], bug=483282) | 186         ['mac'], bug=483282) | 
| 183     self.Fail('conformance2/textures/canvas/*', ['mac'], bug=483282) | 187     self.Fail('conformance2/textures/canvas/*', ['mac'], bug=483282) | 
| 184     self.Fail('conformance2/textures/video/*', ['mac'], bug=483282) | 188     self.Fail('conformance2/textures/video/*', ['mac'], bug=483282) | 
| 185     self.Fail('conformance2/textures/misc/gl-get-tex-parameter.html', | 189     self.Fail('conformance2/textures/misc/gl-get-tex-parameter.html', | 
| 186         ['mac'], bug=483282) | 190         ['mac'], bug=483282) | 
| 187     self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html', |  | 
| 188         ['mac'], bug=483282) |  | 
| 189     self.Fail('conformance2/textures/misc/texture-npot.html', | 191     self.Fail('conformance2/textures/misc/texture-npot.html', | 
| 190         ['mac'], bug=483282) | 192         ['mac'], bug=483282) | 
| 191 | 193 | 
| 192     # Linux only. | 194     # Linux only. | 
| 193     self.Skip('deqp/functional/gles3/shaderswitch.html', | 195     self.Skip('deqp/functional/gles3/shaderswitch.html', | 
| 194         ['linux'], bug=483282) | 196         ['linux'], bug=483282) | 
| 195     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html', | 197     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html', | 
| 196         ['linux'], bug=483282) | 198         ['linux'], bug=483282) | 
| 197     self.Fail('conformance2/rendering/draw-buffers.html', | 199     self.Fail('conformance2/rendering/draw-buffers.html', | 
| 198         ['linux'], bug=483282) | 200         ['linux'], bug=483282) | 
| 199     self.Fail('conformance2/samplers/samplers.html', | 201     self.Fail('conformance2/samplers/samplers.html', | 
| 200         ['linux'], bug=483282) | 202         ['linux'], bug=483282) | 
| 201 | 203 | 
| 202     # Linux AMD only. | 204     # Linux AMD only. | 
| 203     # It looks like AMD shader compiler rejects many valid ES3 semantics. | 205     # It looks like AMD shader compiler rejects many valid ES3 semantics. | 
| 204     self.Skip('deqp/data/gles3/shaders/arrays.html', | 206     self.Skip('deqp/data/gles3/shaders/arrays.html', | 
| 205         ['linux', 'amd'], bug=483282) | 207         ['linux', 'amd'], bug=483282) | 
| 206     self.Skip('deqp/data/gles3/shaders/qualification_order.html', | 208     self.Skip('deqp/data/gles3/shaders/qualification_order.html', | 
| 207         ['linux', 'amd'], bug=483282) | 209         ['linux', 'amd'], bug=483282) | 
| 208     self.Skip('deqp/functional/gles3/texturestatequery.html', | 210     self.Skip('deqp/functional/gles3/texturestatequery.html', | 
| 209         ['linux', 'amd'], bug=483282) | 211         ['linux', 'amd'], bug=483282) | 
| 210     self.Fail('conformance2/attribs/gl-vertex-attrib-i-render.html', | 212     self.Fail('conformance2/attribs/gl-vertex-attrib-i-render.html', | 
| 211         ['linux', 'amd'], bug=483282) | 213         ['linux', 'amd'], bug=483282) | 
| 212     self.Fail('conformance2/attribs/gl-vertexattribipointer-offsets.html', | 214     self.Fail('conformance2/attribs/gl-vertexattribipointer-offsets.html', | 
| 213         ['linux', 'amd'], bug=483282) | 215         ['linux', 'amd'], bug=483282) | 
| 214     self.Fail('conformance2/buffers/buffer-type-restrictions.html', | 216     self.Fail('conformance2/buffers/buffer-type-restrictions.html', | 
| 215         ['linux', 'amd'], bug=483282) | 217         ['linux', 'amd'], bug=483282) | 
| 216     self.Fail('conformance2/buffers/buffer-overflow-test.html', | 218     self.Fail('conformance2/buffers/buffer-overflow-test.html', | 
| 217         ['linux', 'amd'], bug=483282) | 219         ['linux', 'amd'], bug=483282) | 
| 218     self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html', | 220     self.Fail('conformance2/renderbuffers/framebuffer-texture-layer.html', | 
| 219         ['linux', 'amd'], bug=483282) | 221         ['linux', 'amd'], bug=295792) | 
|  | 222 | 
| 220 | 223 | 
| 221     # Conflicting expectations to test that the | 224     # Conflicting expectations to test that the | 
| 222     # "Expectations Have No collisions" unittest works. | 225     # "Expectations Have No collisions" unittest works. | 
| 223     # page_name = 'conformance/glsl/constructors/glsl-construct-ivec4.html' | 226     # page_name = 'conformance/glsl/constructors/glsl-construct-ivec4.html' | 
| 224 | 227 | 
| 225     # Conflict when all conditions match | 228     # Conflict when all conditions match | 
| 226     # self.Fail(page_name, | 229     # self.Fail(page_name, | 
| 227     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl']) | 230     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl']) | 
| 228     # self.Fail(page_name, | 231     # self.Fail(page_name, | 
| 229     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl']) | 232     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl']) | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 275     # self.Fail(page_name, | 278     # self.Fail(page_name, | 
| 276     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl']) | 279     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl']) | 
| 277     # self.Fail(page_name, | 280     # self.Fail(page_name, | 
| 278     #     ['win', ('nvidia', 0x1), 'debug', 'opengl']) | 281     #     ['win', ('nvidia', 0x1), 'debug', 'opengl']) | 
| 279 | 282 | 
| 280     # Conflicts if between a generic os condition and a specific version | 283     # Conflicts if between a generic os condition and a specific version | 
| 281     # self.Fail(page_name, | 284     # self.Fail(page_name, | 
| 282     #     ['xp', ('nvidia', 0x1), 'debug', 'opengl']) | 285     #     ['xp', ('nvidia', 0x1), 'debug', 'opengl']) | 
| 283     # self.Fail(page_name, | 286     # self.Fail(page_name, | 
| 284     #     ['win', ('nvidia', 0x1), 'debug', 'opengl']) | 287     #     ['win', ('nvidia', 0x1), 'debug', 'opengl']) | 
| OLD | NEW | 
|---|