Update WebGL2 conformance test expectations.

To make Win8 Rel, Win8 Debug, Win7 NVidia GeForce GT 730 bots on GPU FYI waterfall
green.

BUG=
TEST=above mentioned bots
TBR=kbr@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/1833163002

Cr-Commit-Position: refs/heads/master@{#383306}

1 files changed, 59 insertions, 0 deletions

diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
index 593a680..e33736c3 100644
--- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
+++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py
@@ -384,6 +384,31 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         'tex-image-and-sub-image-2d-with-image-bitmap-from-video-' +
         'rgb5_a1-rgba-unsigned_byte.html',
         ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-canvas-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-blob-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-bitmap-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-bitmap-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+
     self.Fail('conformance2/textures/video/tex-image-and-sub-image-3d' +
         '-with-video-rgb5_a1-rgba-unsigned_byte.html',
         ['win8'], bug=560555)
@@ -444,6 +469,30 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('conformance2/textures/webgl_canvas/tex-image-and-sub-image-3d' +
         '-with-webgl-canvas-rgb565-rgb-unsigned_byte.html',
         ['win8'], bug=560555)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-canvas-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-blob-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-bitmap-' +
+        'rgb565-rgb-unsigned_byte.html',
+        ['win8'], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-bitmap-' +
+        'rgb5_a1-rgba-unsigned_byte.html',
+        ['win8'], bug=483282)
 
     # Windows Debug. Causing assertions in the GPU process which raise
     # a dialog box, so have to skip them rather than mark them as
@@ -463,6 +512,16 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('conformance2/buffers/uniform-buffers.html',
         ['win', 'intel'], bug=483282)
 
+    # Win7 / NVidia / GeForce GT 730
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-2d-with-image-bitmap-from-image-bitmap-' +
+        'r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html',
+        ['win7', ('nvidia', 0xf02)], bug=483282)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/' +
+        'tex-image-and-sub-image-3d-with-image-bitmap-from-image-bitmap-' +
+        'r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html',
+        ['win7', ('nvidia', 0xf02)], bug=483282)
+
     # Mac only.
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['mac'], bug=483282)