Improve CopyTex{Sub}Image2D format validation.

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 64 matching lines @@
         ['d3d9', 'd3d11', 'opengl'], 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)
 
     # Failing because the tests are using invalid combinations of source and
     # destination formats, see https://github.com/KhronosGroup/WebGL/issues/1628
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgb565-rgb-unsigned_byte.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgb565-rgb-unsigned_short_5_6_5.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgb5_a1-rgba-unsigned_byte.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgba4-rgba-unsigned_byte.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/' +
         'tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
+        bug=483282)
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-rgb565-rgb-unsigned_byte.html',
+        bug=483282)
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-rgb565-rgb-unsigned_short_5_6_5.html',
+        bug=483282)
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-rgb5_a1-rgba-unsigned_byte.html',
+        bug=483282)
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html',
+        bug=483282)
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-rgba4-rgba-unsigned_byte.html',
+        bug=483282)
+    self.Fail('conformance2/textures/canvas/' +
+        'tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html',
+        bug=483282)
 
     # 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('conformance2/textures/canvas/' +
-        'tex-2d-rgb565-rgb-unsigned_byte.html',
-        ['win'], bug=483282)

[Corentin Wallez, 2016/06/02 21:29:40]

likewise from Windows only to general.

[Zhenyao Mo, 2016/06/03 18:29:48]

I actually did that :)

-    self.Fail('conformance2/textures/canvas/' +
-        'tex-2d-rgb565-rgb-unsigned_short_5_6_5.html',
-        ['win'], bug=483282)
-    self.Fail('conformance2/textures/canvas/' +
-        'tex-2d-rgb5_a1-rgba-unsigned_byte.html',
-        ['win'], bug=483282)
-    self.Fail('conformance2/textures/canvas/' +
-        'tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html',
-        ['win'], bug=483282)
-    self.Fail('conformance2/textures/canvas/' +
-        'tex-2d-rgba4-rgba-unsigned_byte.html',
-        ['win'], bug=483282)
-    self.Fail('conformance2/textures/canvas/' +
-        'tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html',
-        ['win'], bug=483282)
-
     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 544 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'])