Roll WebGL conformance tests.

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 61 matching lines @@
     self.Skip('deqp/functional/gles3/textureshadow.html', bug=483282)
     self.Skip('deqp/functional/gles3/texturespecification*.html', bug=483282)
     self.Skip('deqp/functional/gles3/texturewrap.html', bug=483282)
     self.Skip('deqp/functional/gles3/transformfeedback.html', bug=483282)
     self.Skip('deqp/functional/gles3/uniformapi.html', bug=483282)
     self.Skip('deqp/functional/gles3/uniformbuffers.html', bug=483282)
     self.Skip('deqp/functional/gles3/vertexarrays.html', bug=483282)
 
     self.Fail('conformance2/glsl3/array-complex-indexing.html', bug=483282)
     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
-    self.Fail('conformance2/samplers/sampler-drawing-test.html', bug=483282)
     self.Fail('conformance2/state/gl-object-get-calls.html', bug=483282)
     # Note that this test fails on ['win', 'intel'] with bug=483282
     self.Fail('conformance2/buffers/uniform-buffers.html', bug=577368)
 
-    # Remove the following after roll in ToT WebGL conformance tests.
-    self.Fail('conformance2/reading/read-pixels-into-pixel-pack-buffer.html',
-        ['mac', 'linux'], bug=570453)
+    # The following two entries are due to validation of TEXTURE_3D target on
+    # 2D texture calls.
+    # compressed-tex-image.html fails on Mac with bug ID 565438.
+    self.Fail('conformance2/textures/misc/compressed-tex-image.html',
+        bug=483282)
+    # tex-input-validation fails on Win and ['mac', ('nvidia', 0xfe9)].
+    self.Fail('conformance2/textures/misc/tex-input-validation.html',
+        bug=483282)
 
     # Windows only.
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-r8-red-unsigned_byte.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rg8-rg-unsigned_byte.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rgb8-rgb-unsigned_byte.html',
@@ skipping 103 matching lines @@
     self.Skip('deqp/functional/gles3/texturestatequery.html',
         ['win'], bug=483282)
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['win'], bug=483282)
     self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
         ['win'], bug=483282)
     self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/misc/gl-get-tex-parameter.html',
         ['win'], bug=483282)
-    self.Fail('conformance2/textures/misc/tex-input-validation.html',
-        ['win'], bug=483282)
     self.Skip('conformance2/textures/misc/tex-mipmap-levels.html',
         ['win'], bug=483282)
     self.Skip('conformance2/transform_feedback/transform_feedback.html',
         ['win'], bug=483282)
     self.Fail('conformance2/glsl3/const-array-init.html',
         ['win'], bug=1198) # angle bug ID
     self.Skip('conformance2/reading/read-pixels-into-pixel-pack-buffer.html',
         ['win'], bug=1266) # angle bug ID
+    self.Fail('conformance2/textures/misc/copy-texture-image.html',
+        ['win'], bug=577144)
 
     # Windows 8 only.
     self.Fail('conformance2/textures/image_data/tex-image-and-sub-image-2d' +
         '-with-image-data-rgb565-rgb-unsigned_byte.html',
         ['win8'], bug=483282)
     self.Fail('conformance2/textures/image_data/tex-image-and-sub-image-2d' +
         '-with-image-data-rgb5_a1-rgba-unsigned_byte.html',
         ['win8'], bug=483282)
     self.Fail('conformance2/textures/image/tex-image-and-sub-image-2d' +
         '-with-image-rgb565-rgb-unsigned_byte.html',
@@ skipping 38 matching lines @@
         '-with-svg-image-rgb5_a1-rgba-unsigned_byte.html',
         ['win8'], bug=560555)
 
     # Windows Debug. Causing assertions in the GPU process which raise
     # a dialog box, so have to skip them rather than mark them as
     # failing.
     self.Skip('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rgba8-rgba-unsigned_byte.html',
         ['win', 'debug'], bug=542901)
 
+    # Windows AMD/ATI only.
+    self.Fail('deqp/functional/gles3/fbostencilbuffer.html',
+        ['win', 'amd'], bug=483282)
+
     # Mac only.
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['mac'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/scoping.html',
         ['mac'], bug=483282)
     self.Skip('deqp/functional/gles3/defaultvertexattribute.html',
         ['mac'], bug=483282)
     self.Skip('deqp/functional/gles3/floatstatequery.html',
         ['mac'], bug=483282)
     self.Skip('deqp/functional/gles3/texturestatequery.html',
@@ skipping 29 matching lines @@
     self.Fail('conformance2/textures/misc/texture-npot.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html',
         ['mac'], bug=295792)
     self.Fail('conformance2/renderbuffers/invalidate-framebuffer.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/renderbuffers/framebuffer-test.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/renderbuffers/readbuffer.html',
         ['mac'], bug=570453)
-    self.Fail('conformance2/textures/misc/compressed-tex-image.html',
-        ['mac'], bug=565438)
     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
         ['mac'], bug=483282)
+    self.Fail('conformance2/textures/misc/copy-texture-image.html',
+        ['mac'], bug=577144)
 
     # Mac Retina NVIDIA
     self.Fail('conformance2/rendering/draw-buffers.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
-    self.Fail('conformance2/textures/misc/tex-input-validation.html',
-        ['mac', ('nvidia', 0xfe9)], bug=483282)
 
     # Linux only.
     self.Skip('deqp/functional/gles3/shaderswitch.html',
         ['linux'], bug=483282)
     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html',
         ['linux'], bug=483282)
     self.Fail('conformance2/rendering/draw-buffers.html',
         ['linux'], bug=483282)
 
     # Linux AMD only.
@@ skipping 73 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'])