Roll WebGL 1012e1f..328c6be

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 49 matching lines @@
     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)
 
-    # Remove after we roll in https://github.com/KhronosGroup/WebGL/pull/1520.
-    self.Fail('conformance2/vertex_arrays/vertex-array-object.html',
-        bug=295792)
+    self.Fail('conformance2/misc/expando-loss-2.html', bug=483282)
 
-    # Note that this test fails on ['win', 'intel'] with bug=483282
-    self.Fail('conformance2/buffers/uniform-buffers.html', bug=577368)
-    self.Fail('conformance2/misc/expando-loss-2.html', bug=483282)
+    # Windows / Mac.
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-' +
+        'r8-red-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-' +
+        'r16f-red-half_float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-' +
+        'r16f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-' +
+        'r32f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-' +
+        'r8ui-red_integer-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-' +
+        'srgb8-rgb-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-' +
+        'srgb8_alpha8-rgba-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-' +
+        'r8-red-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-' +
+        'r16f-red-half_float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-' +
+        'r16f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-' +
+        'r32f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-' +
+        'r8ui-red_integer-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-' +
+        'srgb8-rgb-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_image/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-' +
+        'srgb8_alpha8-rgba-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'r8-red-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'r16f-red-half_float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'r16f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'r32f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'r8ui-red_integer-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'srgb8-rgb-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'srgb8_alpha8-rgba-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'r8-red-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'r16f-red-half_float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'r16f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'r32f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'r8ui-red_integer-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'srgb8-rgb-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'srgb8_alpha8-rgba-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'r8-red-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'r16f-red-half_float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'r16f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'r32f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'r8ui-red_integer-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'srgb8-rgb-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'srgb8_alpha8-rgba-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'r8-red-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'r16f-red-half_float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'r16f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'r32f-red-float.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'r8ui-red_integer-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'srgb8-rgb-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'srgb8_alpha8-rgba-unsigned_byte.html',
+        ['win', 'mac'], bug=595097)
 
     # 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',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rgb565-rgb-unsigned_byte.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rgb565-rgb-unsigned_short_5_6_5.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rgb5_a1-rgba-unsigned_byte.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rgb5_a1-rgba-unsigned_short_5_5_5_1.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rgba4-rgba-unsigned_byte.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/canvas/tex-image-and-sub-image-2d' +
         '-with-canvas-rgba4-rgba-unsigned_short_4_4_4_4.html',
         ['win'], bug=483282)
+    self.Fail('conformance2/textures/misc/tex-unpack-params.html',
+        ['win'], bug=483282)
 
     self.Fail('conformance2/textures/webgl_canvas/tex-image-and-sub-image-2d' +
         '-with-webgl-canvas-r8-red-unsigned_byte.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/tex-image-and-sub-image-2d' +
         '-with-webgl-canvas-rg8-rg-unsigned_byte.html',
         ['win'], bug=483282)
     self.Fail('conformance2/textures/webgl_canvas/tex-image-and-sub-image-2d' +
         '-with-webgl-canvas-rgb8-rgb-unsigned_byte.html',
         ['win'], bug=483282)
@@ skipping 163 matching lines @@
         '-with-canvas-rgba8-rgba-unsigned_byte.html',
         ['win', 'debug'], bug=542901)
 
     # Win / AMD flakiness seen on the FYI waterfall.
     # It's unfortunate that this suppression needs to be so broad, but
     # basically any test that uses readPixels is potentially flaky, and
     # it's infeasible to suppress individual failures one by one.
     self.Flaky('conformance2/*', ['win', ('amd', 0x6779)], bug=491419)
     self.Flaky('deqp/*', ['win', ('amd', 0x6779)], bug=491419)
 
+    # Win / Intel
+    self.Fail('conformance2/buffers/uniform-buffers.html',
+        ['win', 'intel'], 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 51 matching lines @@
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/shaderstruct.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
 
     # Mac AMD
     self.Fail('deqp/functional/gles3/clipping.html',
         ['mac', 'amd'], bug=483282)
 
+    # Mac Intel
+    self.Fail('conformance2/textures/misc/tex-unpack-params.html',
+        ['mac', 'intel'], 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)
-    self.Fail('deqp/functional/gles3/fbostatequery.html',
-        ['linux'], bug=483282)
 
     self.Flaky('deqp/functional/gles3/negativeshaderapi.html',
         ['linux'], bug=483282)
 
     # Linux AMD only.
     # It looks like AMD shader compiler rejects many valid ES3 semantics.
     self.Skip('deqp/data/gles3/shaders/arrays.html',
         ['linux', 'amd'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['linux', 'amd'], bug=483282)
@@ skipping 87 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'])