Roll WebGL ba8c5aa..f43726c

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 from gpu_tests.webgl_conformance_expectations import WebGLConformanceExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
   def __init__(self, conformance_path):
     super(WebGL2ConformanceExpectations, self).__init__(conformance_path)
@@ skipping 10 matching lines @@
     self.Fail('WebglExtension.WEBGL_compressed_texture_atc',
         ['win', 'mac', 'linux'])
     self.Fail('WebglExtension.WEBGL_compressed_texture_etc1',
         ['mac', 'linux'])
     self.Fail('WebglExtension.WEBGL_compressed_texture_pvrtc',
         ['win', 'mac', 'linux'])
 
     # ========================
     # Conformance expectations
     # ========================
+
+    # Passing tests, waiting to be turned on when sharding is implemented.
+    self.Skip('deqp/functional/gles3/shadermatrix/*', bug=1)
+
     # All platforms.
     self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=483282)
     self.Skip('deqp/functional/gles3/draw.html', bug=483282)
     self.Skip('deqp/functional/gles3/fbocolorbuffer.html', bug=483282)
-    self.Skip('deqp/functional/gles3/fbodepthbuffer.html', bug=483282)
     self.Skip('deqp/functional/gles3/fboinvalidate.html', bug=483282)
     self.Skip('deqp/functional/gles3/fbomultisample.html', bug=483282)
     self.Skip('deqp/functional/gles3/fborender.html', bug=483282)
     self.Skip('deqp/functional/gles3/fragmentoutput.html', bug=483282)
     self.Skip('deqp/functional/gles3/framebufferblit.html', bug=483282)
     self.Skip('deqp/functional/gles3/instancedrendering.html', bug=483282)
     self.Skip('deqp/data/gles3/shaders/linkage.html', bug=601821)
     self.Skip('deqp/functional/gles3/negativebufferapi.html', bug=483282)
     self.Skip('deqp/functional/gles3/negativetextureapi.html', bug=483282)
     self.Skip('deqp/functional/gles3/negativevertexarrayapi.html', bug=483282)
     self.Skip('deqp/functional/gles3/occlusionquery.html', bug=483282)
     self.Skip('deqp/functional/gles3/shadercommonfunction.html', bug=483282)
     self.Skip('deqp/functional/gles3/shaderderivate.html', bug=483282)
-    self.Skip('deqp/functional/gles3/shaderloop.html', bug=483282)
-    self.Skip('deqp/functional/gles3/shadermatrix.html', bug=483282)
     self.Skip('deqp/functional/gles3/shaderoperator.html', bug=483282)
     self.Skip('deqp/functional/gles3/shaderpackingfunction.html', bug=483282)
     self.Skip('deqp/functional/gles3/shadertexturefunction/*.html', bug=483282)
     self.Skip('deqp/functional/gles3/sync.html', bug=483282)
     self.Skip('deqp/functional/gles3/textureshadow/*.html', bug=483282)
     self.Skip('deqp/functional/gles3/transformfeedback.html', bug=483282)
     self.Skip('deqp/functional/gles3/uniformbuffers.html', bug=483282)
 
     self.Fail('deqp/data/gles3/shaders/preprocessor.html', bug=483282)
-    self.Flaky('deqp/functional/gles3/shaderindexing.html', bug=483282)
 
     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
 
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
     self.Fail('conformance2/vertex_arrays/vertex-array-object.html', bug=483282)
 
     self.Fail('conformance2/rendering/draw-buffers.html', bug=617410)
 
     # All platforms when running ANGLE
     self.Fail('conformance2/textures/misc/tex-unpack-params.html',
@@ skipping 48 matching lines @@
 
     # Windows only.
 
     self.Fail('deqp/functional/gles3/vertexarrays.html',
         ['win'], bug=483282)
 
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'basic_copyteximage2d.html',
         ['win'], bug=483282)
 
+    self.Fail('deqp/functional/gles3/shaderloop_for.html',
+        ['win'], bug=617817)
+    self.Fail('deqp/functional/gles3/shaderloop_while.html',
+        ['win'], bug=617817)
+    self.Fail('deqp/functional/gles3/shaderloop_do_while.html',
+        ['win'], bug=617817)
+
     self.Flaky('deqp/functional/gles3/buffercopy.html', ['win'], bug=587601)
 
     self.Skip('deqp/functional/gles3/readpixel.html', ['win'], bug=483282)
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['win'], bug=483282)
     self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
         ['win'], bug=483282)
     self.Skip('conformance2/textures/misc/tex-mipmap-levels.html',
         ['win'], bug=483282)
     self.Skip('conformance2/transform_feedback/transform_feedback.html',
@@ skipping 194 matching lines @@
     self.Fail('deqp/functional/gles3/textureformat/compressed_cube.html',
         ['win', 'intel'], bug=614418)
 
     # Mac only.
     self.Fail('deqp/functional/gles3/texturefiltering/cube_formats_*',
         ['mac'], bug=606074)
     self.Fail('deqp/functional/gles3/texturefiltering/cube_sizes_*',
         ['mac'], bug=606074)
     self.Fail('deqp/functional/gles3/texturefiltering/cube_combinations_*',
         ['mac'], bug=606074)
+    self.Fail('deqp/functional/gles3/shaderloop_do_while.html',
+        ['mac'], bug=617820)
 
     self.Skip('deqp/functional/gles3/texturespecification/' +
         'basic_copyteximage2d.html',
         ['mac'], bug=577144)
     self.Skip('deqp/functional/gles3/texturespecification/' +
         'basic_copytexsubimage2d.html',
         ['mac'], bug=577144)
     self.Fail('deqp/functional/gles3/textureformat/unsized_2d_array.html',
         ['mac'], bug=577144)
     self.Fail('deqp/functional/gles3/textureformat/unsized_3d.html',
@@ skipping 119 matching lines @@
 
     # Linux only.
     self.Fail('deqp/data/gles3/shaders/functions.html',
         ['linux'], bug=483282)
     self.Fail('deqp/functional/gles3/uniformapi/random.html',
         ['linux'], bug=616558)
     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html',
         ['linux'], bug=483282)
     self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
         ['linux'], bug=483282)
+    self.Fail('deqp/functional/gles3/fbodepthbuffer.html',
+        ['linux'], bug=483282)
 
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['linux', 'amd', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/clipping.html',
         ['linux', 'amd', 'intel'], bug=483282)
 
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_cube.html',
         ['linux'], bug=483282)
 
@@ skipping 37 matching lines @@
     self.Fail('deqp/functional/gles3/internalformatquery.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/texturestatequery.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/vertexarrays.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/buffercopy.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/samplerobject.html',
         ['linux', 'amd'], bug=483282)
-    self.Fail('deqp/functional/gles3/shaderprecision.html',
+    self.Fail('deqp/functional/gles3/shaderprecision*.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/texturefiltering/3d*',
         ['linux', 'amd'], bug=606114)
     self.Fail('deqp/functional/gles3/fbocompleteness.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/lifetime.html',
         ['linux', 'amd'], bug=483282)
 
     self.Fail('conformance2/misc/uninitialized-test-2.html',
         ['linux', 'amd'], bug=483282)
@@ skipping 135 matching lines @@
     # self.Fail(page_name,
     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])
 
     # Conflicts if between a generic os condition and a specific version
     # self.Fail(page_name,
     #     ['xp', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])