WebGL 2: Update AMD expectations.

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 27 matching lines @@
         ['linux'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-srgb-mipmap.html', bug=634519)
 
     # All platforms.
     self.Fail('conformance/misc/object-deletion-behaviour.html', bug=644957)
     self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html',
         bug=664740)
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
     self.Fail('conformance2/misc/expando-loss-2.html', bug=483282)
 
-    # All platforms with AMD GPU.
-    self.Fail('deqp/functional/gles3/multisample.html',
-        ['amd'], bug=617290)
-
     # Windows only.
     self.Fail('conformance2/textures/misc/copy-texture-image-luma-format.html',
         ['win'], bug=638470)
 
     # Win / NVidia
     self.Flaky('deqp/functional/gles3/fbomultisample*',
         ['win', 'nvidia'], bug=631317)
 
+    # This should be fixed in the latest driver.
+    self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
+        ['win', 'nvidia'], bug=1246) # ANGLE bug.
+
     # Win / AMD
 
     # Failing on old R5 230 configuration.
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['win', ('amd', 0x6779)], bug=483282)
 
     self.Fail('deqp/functional/gles3/transformfeedback/*',
         ['win', ('amd', 0x6779)], bug=626068)
 
     self.Fail('deqp/functional/gles3/shadercommonfunction.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/fbomultisample.8_samples.html',
         ['win', ('amd', 0x6779)], bug=483282)
+    self.Fail('deqp/functional/gles3/multisample.html',
+        ['win', ('amd', 0x6779)], bug=617290)
 
     # Keep a separate set of failures for the R7 240, since it can use a new
     # and updated driver. The older drivers won't ever get fixes from AMD.
     self.Fail('deqp/functional/gles3/framebufferblit/depth_stencil.html',
         ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturefiltering/2d_array*',
         ['win', ('amd', 0x6613)], bug=638323)
     self.Fail('deqp/functional/gles3/texturefiltering/cube*',
         ['win', ('amd', 0x6613)], bug=638323)
 
@@ skipping 244 matching lines @@
 
     self.Flaky('deqp/functional/gles3/vertexarrays/' +
         'multiple_attributes.output.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
 
     # Mac AMD
     self.Fail('conformance/glsl/bugs/bool-type-cast-bug-int-float.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('conformance2/glsl3/bool-type-cast-bug-uint-ivec-uvec.html',
         ['mac', 'amd'], bug=483282)
+    self.Fail('deqp/functional/gles3/multisample.html',
+        ['mac', 'amd'], bug=617290)
     self.Fail('deqp/functional/gles3/instancedrendering.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/pixelbufferobject.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/primitiverestart/00.html',
         ['mac', 'amd'], bug=598930)
     self.Fail('deqp/functional/gles3/primitiverestart/01.html',
         ['mac', 'amd'], bug=598930)
     self.Fail('deqp/functional/gles3/shadercommonfunction.html',
         ['mac', 'amd'], bug=483282)
@@ skipping 193 matching lines @@
     # Linux Intel with ANGLE only
     self.Fail('deqp/functional/gles3/fragmentoutput/*.html',
         ['linux', 'intel', 'opengl'], bug=598902)
 
     # Linux Intel without ANGLE only
     self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
         ['linux', 'intel', 'no_angle'], bug=598902)
 
     # Linux AMD only.
     # It looks like AMD shader compiler rejects many valid ES3 semantics.
+    self.Fail('deqp/functional/gles3/multisample.html',
+        ['linux', 'amd'], bug=617290)
     self.Fail('deqp/data/gles3/shaders/conversions.html',
         ['linux', 'amd'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/arrays.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/internalformatquery.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/texturestatequery.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/buffercopy.html',
         ['linux', 'amd'], bug=483282)
@@ skipping 252 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'])