Roll WebGL ce8f6bb..1eb6562

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 11 matching lines @@
         ['win', 'mac', 'linux'])
     self.Fail('WebglExtension.WEBGL_compressed_texture_etc1',
         ['mac', 'linux'])
     self.Fail('WebglExtension.WEBGL_compressed_texture_pvrtc',
         ['win', 'mac', 'linux'])
 
     # ========================
     # Conformance expectations
     # ========================
 
+    # 2.0.1 OR LATER
+
+    # Too slow (take about one hour to run)
+    self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=619403)
+
+    self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
+    self.Fail('conformance2/glsl3/tricky-loop-conditions.html', bug=483282)
+
     # All platforms.
 
     self.Fail('conformance/textures/image_bitmap_from_canvas/' +
               'tex-2d-rgba-rgba-unsigned_byte.html', bug=483282)
     self.Fail('conformance/textures/image_bitmap_from_canvas/' +
               'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html', bug=483282)
     self.Fail('conformance/textures/image_bitmap_from_canvas/' +
               'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html', bug=483282)
     self.Fail('conformance/textures/image_bitmap_from_canvas/' +
               'tex-2d-rgb-rgb-unsigned_byte.html', bug=483282)
     self.Fail('conformance/textures/image_bitmap_from_canvas/' +
               'tex-2d-rgb-rgb-unsigned_short_5_6_5.html', bug=483282)
-    self.Fail('deqp/data/gles2/shaders/preprocessor.html', bug=483282)
-    self.Fail('deqp/data/gles3/shaders/preprocessor.html', bug=483282)
-
-    # Too slow (take about one hour to run)
-    self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=619403)
 
     self.Fail('deqp/data/gles3/shaders/linkage.html', bug=601821)
 
-    self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
-
     # Mark this test Flaky on all platforms but Intel Linux that is failing
     # reliably.
     self.Flaky('conformance2/query/occlusion-query.html',
         ['win', 'mac'], bug=603168)
     self.Flaky('conformance2/query/occlusion-query.html',
         ['linux', 'nvidia', 'amd'], bug=603168)
 
     self.Fail('conformance2/rendering/attrib-type-match.html', bug=627193)
 
     self.Fail('conformance2/transform_feedback/' +
         'unwritten-output-defaults-to-zero.html', bug=1441) # ANGLE bug
 
-    # Likely move this to WebGL 2.0.1.
-    self.Fail('conformance2/glsl3/tricky-loop-conditions.html', bug=483282)
-
     # Avoid a conflict with a Mac expectation by setting
     self.Fail('conformance2/textures/misc/tex-input-validation.html',
         ['d3d9', 'd3d11', 'opengl'], bug=483282)
 
     # All platforms with AMD GPU.
     self.Fail('deqp/functional/gles3/multisample.html',
         ['amd'], bug=617290)
 
     # Windows only.
     self.Fail('conformance/glsl/bugs/' +
@@ skipping 146 matching lines @@
     # It's unfortunate that these suppressions need to be so broad, but it
     # looks like the D3D11 device can be lost spontaneously on this
     # configuration while running basically any test.
     self.Flaky('conformance/*', ['win', 'intel'], bug=628395)
     self.Flaky('conformance2/*', ['win', 'intel'], bug=628395)
     self.Flaky('deqp/*', ['win', 'intel'], bug=628395)
 
     # Mac only.
     self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
               ['mac'], bug=483282)
-    self.Fail('deqp/data/gles2/shaders/scoping.html',
-              ['mac'], bug=483282)
     self.Flaky('deqp/functional/gles3/shaderindexing/varying.html',
         ['mac'], bug=619264)
     self.Fail('deqp/functional/gles3/shaderloop_do_while.html',
         ['mac'], bug=617820)
     # This one's flaky on AMD, NVIDIA and Intel GPUs, but the
     # GPU-specific expectations aren't working properly.
     self.Fail('deqp/functional/gles3/shaderpackingfunction.html',
         ['mac'], bug=619264)
     self.Fail('deqp/functional/gles3/uniformbuffers/random.html',
         ['mac'], bug=618464)
 
-    self.Fail('deqp/functional/gles3/textureformat/compressed_cube.html',
-        ['mac'], bug=612205)
-
     self.Fail('deqp/data/gles3/shaders/qualification_order.html',
         ['mac'], bug=483282)
-    self.Fail('deqp/data/gles3/shaders/scoping.html',
-        ['mac'], bug=483282)
     self.Fail('deqp/functional/gles3/pixelbufferobject.html',
         ['mac'], bug=483282)
 
     self.Fail('conformance2/renderbuffers/framebuffer-test.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/rendering/framebuffer-completeness-unaffected.html',
         ['mac'], bug=604053)
 
     self.Fail('deqp/functional/gles3/instancedrendering.html',
         ['mac'], bug=483282)
@@ skipping 284 matching lines @@
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
                ['linux'], bug=627525)
 
     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html',
         ['linux'], bug=483282)
 
     self.Fail('deqp/functional/gles3/fbodepthbuffer.html',
         ['linux'], bug=483282)
 
-    # Behavior difference between GL compatibility profile and ES3.
-    self.Fail('conformance2/rendering/draw-buffers.html',
-        ['linux'], bug=617410)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_cube.html',
         ['linux'], bug=483282)
     self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
         ['linux'], bug=624506)
 
     # Multi-vendor failures.
 
     self.Fail('conformance/glsl/misc/shaders-with-invariance.html',
         ['linux', 'amd', 'intel'], bug=483282)
@@ skipping 56 matching lines @@
     self.Fail('deqp/functional/gles3/shaderderivate_dfdx.html',
         ['linux', 'intel'], bug=618408)
 
     # See https://bugs.freedesktop.org/show_bug.cgi?id=94477
     self.Skip('conformance/glsl/bugs/temp-expressions-should-not-crash.html',
         ['linux', 'intel'], bug=540543)  # GPU timeout
 
     # The Mesa Intel driver has a scoping bug, see
     # https://bugs.freedesktop.org/show_bug.cgi?id=95184
     # It has been fixed in Mesa 12.0
-    self.Fail('deqp/data/gles2/shaders/scoping.html',
-        ['linux', 'intel'], bug=610800)
     self.Fail('deqp/data/gles3/shaders/scoping.html',
         ['linux', 'intel'], bug=610800)
 
     # The Intel Mesa driver only supports sRGB encoding in ES 3.x, see
     # https://patchwork.freedesktop.org/patch/76903
     # So these tests fail on core profile.
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_04.html',
         ['linux', 'intel'], bug=598902)
     self.Fail('deqp/functional/gles3/framebufferblit/conversion_07.html',
         ['linux', 'intel'], bug=598902)
@@ skipping 319 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'])