| Index: content/test/gpu/gpu_tests/webgl2_conformance_expectations.py | 
| diff --git a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py | 
| index 05a6ce8125c82bba11c1350f9b4ea8f54a0d6ab3..f727e8fe8b4a31359c7238e9db0ea4a995c318f5 100644 | 
| --- a/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py | 
| +++ b/content/test/gpu/gpu_tests/webgl2_conformance_expectations.py | 
| @@ -52,64 +52,70 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations): | 
| 'integer-cubemap-specification-order-bug.html', | 
| bug=483282) # owner:cwallez, test might be buggy | 
|  | 
| -    # Win and Mac | 
| -    self.Fail('deqp/functional/gles3/sync.html', ['win', 'mac'], bug=676848) | 
| - | 
| # Windows only. | 
| self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html', | 
| -        ['win'], bug=644740) | 
| +        ['win', 'd3d11'], bug=644740) | 
| +    self.Fail('deqp/functional/gles3/sync.html', ['win', 'd3d11'], bug=676848) | 
|  | 
| # Win / NVidia | 
| self.Flaky('deqp/functional/gles3/fbomultisample*', | 
| -        ['win', 'nvidia'], bug=631317) | 
| +        ['win', 'nvidia', 'd3d11'], bug=631317) | 
| self.Fail('conformance2/rendering/' + | 
| 'draw-with-integer-texture-base-level.html', | 
| -        ['win', 'nvidia'], bug=679639) | 
| +        ['win', 'nvidia', 'd3d11'], bug=679639) | 
|  | 
| # Win10 / NVIDIA Quadro M2000 failures | 
| self.Fail('deqp/functional/gles3/transformfeedback/' + | 
| 'basic_types_interleaved_lines.html', | 
| -        ['win10', ('nvidia', 0x1430)], bug=680754) | 
| +        ['win10', ('nvidia', 0x1430), 'd3d11'], bug=680754) | 
| self.Fail('deqp/functional/gles3/transformfeedback/' + | 
| 'basic_types_interleaved_triangles.html', | 
| -        ['win10', ('nvidia', 0x1430)], bug=680754) | 
| +        ['win10', ('nvidia', 0x1430), 'd3d11'], bug=680754) | 
| self.Fail('deqp/functional/gles3/transformfeedback/' + | 
| 'basic_types_separate_lines.html', | 
| -        ['win10', ('nvidia', 0x1430)], bug=680754) | 
| +        ['win10', ('nvidia', 0x1430), 'd3d11'], bug=680754) | 
| self.Fail('deqp/functional/gles3/transformfeedback/' + | 
| 'basic_types_separate_triangles.html', | 
| -        ['win10', ('nvidia', 0x1430)], bug=680754) | 
| +        ['win10', ('nvidia', 0x1430), 'd3d11'], bug=680754) | 
| self.Fail('deqp/functional/gles3/transformfeedback/' + | 
| 'random_interleaved_lines.html', | 
| -        ['win10', ('nvidia', 0x1430)], bug=680754) | 
| +        ['win10', ('nvidia', 0x1430), 'd3d11'], bug=680754) | 
| self.Fail('deqp/functional/gles3/transformfeedback/' + | 
| 'random_interleaved_triangles.html', | 
| -        ['win10', ('nvidia', 0x1430)], bug=680754) | 
| +        ['win10', ('nvidia', 0x1430), 'd3d11'], bug=680754) | 
| self.Fail('deqp/functional/gles3/transformfeedback/' + | 
| 'random_separate_lines.html', | 
| -        ['win10', ('nvidia', 0x1430)], bug=680754) | 
| +        ['win10', ('nvidia', 0x1430), 'd3d11'], bug=680754) | 
| self.Fail('deqp/functional/gles3/transformfeedback/' + | 
| 'random_separate_triangles.html', | 
| -        ['win10', ('nvidia', 0x1430)], bug=680754) | 
| +        ['win10', ('nvidia', 0x1430), 'd3d11'], bug=680754) | 
| self.Fail('deqp/functional/gles3/transformfeedback/interpolation_flat.html', | 
| -        ['win10', ('nvidia', 0x1430)], bug=680754) | 
| +        ['win10', ('nvidia', 0x1430), 'd3d11'], bug=680754) | 
| + | 
| +    # Win / NVIDIA / OpenGL | 
| +    self.Fail('conformance2/rendering/framebuffer-texture-level1.html', | 
| +        ['win', 'nvidia', 'opengl'], bug=693090) | 
| +    self.Fail('conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug.html', | 
| +        ['win', 'nvidia', 'opengl'], bug=693090) | 
| +    self.Fail('conformance2/textures/misc/tex-srgb-mipmap.html', | 
| +        ['win', 'nvidia', 'opengl'], bug=693090) | 
|  | 
| # Win / AMD | 
| self.Fail('conformance2/rendering/blitframebuffer-stencil-only.html', | 
| -        ['win', 'amd'], bug=483282) # owner:jmadill | 
| +        ['win', 'amd', 'd3d11'], bug=483282) # owner:jmadill | 
|  | 
| # Failing on old R5 230 configuration. | 
| self.Fail('deqp/functional/gles3/shadertexturefunction/' + | 
| 'texelfetchoffset.html', | 
| -        ['win', ('amd', 0x6779)], bug=483282) | 
| +        ['win', ('amd', 0x6779), 'd3d11'], bug=483282) | 
|  | 
| self.Fail('deqp/functional/gles3/transformfeedback/*', | 
| -        ['win', ('amd', 0x6779)], bug=626068) | 
| +        ['win', ('amd', 0x6779, 'd3d11')], bug=626068) | 
|  | 
| self.Fail('deqp/functional/gles3/shadercommonfunction.html', | 
| -        ['win', ('amd', 0x6779)], bug=483282) | 
| +        ['win', ('amd', 0x6779), 'd3d11'], bug=483282) | 
| self.Fail('deqp/functional/gles3/multisample.html', | 
| -        ['win', ('amd', 0x6779)], bug=617290) | 
| +        ['win', ('amd', 0x6779), 'd3d11'], 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. | 
| @@ -118,72 +124,72 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations): | 
| # It's unfortunate that these suppressions need 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('conformance/*', ['win', ('amd', 0x6779)], bug=491419) | 
| -    self.Flaky('conformance2/*', ['win', ('amd', 0x6779)], bug=491419) | 
| -    self.Flaky('deqp/*', ['win', ('amd', 0x6779)], bug=491419) | 
| +    self.Flaky('conformance/*', ['win', ('amd', 0x6779), 'd3d11'], bug=491419) | 
| +    self.Flaky('conformance2/*', ['win', ('amd', 0x6779), 'd3d11'], bug=491419) | 
| +    self.Flaky('deqp/*', ['win', ('amd', 0x6779), 'd3d11'], bug=491419) | 
|  | 
| # Win / Intel | 
| self.Fail('conformance2/glsl3/' + | 
| 'texture-offset-uniform-texture-coordinate.html', | 
| -        ['win', 'intel'], bug=662644) # WebGL 2.0.1 | 
| +        ['win', 'intel', 'd3d11'], bug=662644) # WebGL 2.0.1 | 
| self.Fail('conformance2/glsl3/unary-minus-operator-in-dynamic-loop.html', | 
| -        ['win', 'intel'], bug=662644) # WebGL 2.0.1 | 
| +        ['win', 'intel', 'd3d11'], bug=662644) # WebGL 2.0.1 | 
| self.Skip('conformance2/textures/misc/copy-texture-image.html', | 
| -        ['win', 'intel'], bug=617449) | 
| +        ['win', 'intel', 'd3d11'], bug=617449) | 
| # Seems to cause the harness to fail immediately afterward | 
| self.Skip('conformance2/textures/video/tex-2d-rgba16f-rgba-half_float.html', | 
| -        ['win', 'intel'], bug=648337) | 
| +        ['win', 'intel', 'd3d11'], bug=648337) | 
| self.Flaky('deqp/functional/gles3/lifetime.html', | 
| -        ['win', 'intel'], bug=620379) | 
| +        ['win', 'intel', 'd3d11'], bug=620379) | 
| self.Skip('deqp/functional/gles3/texturespecification/' + | 
| 'teximage3d_depth_pbo.html', | 
| -        ['win', 'intel'], bug=617449) | 
| +        ['win', 'intel', 'd3d11'], bug=617449) | 
| self.Fail('deqp/functional/gles3/textureformat/sized_color_3d_pot_00.html', | 
| -        ['win', 'intel'], bug=614418) | 
| +        ['win', 'intel', 'd3d11'], bug=614418) | 
| self.Fail('deqp/functional/gles3/textureformat/sized_color_3d_pot_01.html', | 
| -        ['win', 'intel'], bug=614418) | 
| +        ['win', 'intel', 'd3d11'], bug=614418) | 
| self.Fail('deqp/functional/gles3/textureformat/sized_color_3d_pot_02.html', | 
| -        ['win', 'intel'], bug=614418) | 
| +        ['win', 'intel', 'd3d11'], bug=614418) | 
| self.Fail('deqp/functional/gles3/textureformat/sized_color_3d_pot_03.html', | 
| -        ['win', 'intel'], bug=614418) | 
| +        ['win', 'intel', 'd3d11'], bug=614418) | 
| self.Fail('deqp/functional/gles3/textureformat/sized_depth_stencil.html', | 
| -        ['win', 'intel'], bug=614418) | 
| +        ['win', 'intel', 'd3d11'], bug=614418) | 
| self.Flaky('deqp/functional/gles3/textureformat/unsized_3d.html', | 
| -        ['win', 'intel'], bug=614418) | 
| +        ['win', 'intel', 'd3d11'], bug=614418) | 
|  | 
| self.Fail('deqp/functional/gles3/fbomultisample*', | 
| -        ['win', 'intel'], bug=483282) | 
| +        ['win', 'intel', 'd3d11'], bug=483282) | 
|  | 
| # These tests seem to crash flakily. It's best to leave them as skip | 
| # until we can run them without GPU hangs and crashes. | 
| self.Skip('deqp/functional/gles3/textureshadow/2d_array_*.html', | 
| -        ['win', 'intel'], bug=666392) | 
| +        ['win', 'intel', 'd3d11'], bug=666392) | 
|  | 
| # Intel HD 530 | 
| self.Fail('conformance2/textures/misc/angle-stuck-depth-textures.html', | 
| -        ['win', 'intel'], bug=680797) | 
| +        ['win', 'intel', 'd3d11'], bug=680797) | 
| self.Fail('deqp/functional/gles3/fboinvalidate/format_00.html', | 
| -        ['win', 'intel'], bug=680797) | 
| +        ['win', 'intel', 'd3d11'], bug=680797) | 
| self.Fail('deqp/functional/gles3/fboinvalidate/format_01.html', | 
| -        ['win', 'intel'], bug=680797) | 
| +        ['win', 'intel', 'd3d11'], bug=680797) | 
| self.Fail('deqp/functional/gles3/fboinvalidate/format_02.html', | 
| -        ['win', 'intel'], bug=680797) | 
| +        ['win', 'intel', 'd3d11'], bug=680797) | 
| self.Fail('deqp/functional/gles3/framebufferblit/' + | 
| 'default_framebuffer_03.html', | 
| -        ['win', 'intel'], bug=680797) | 
| +        ['win', 'intel', 'd3d11'], bug=680797) | 
| self.Fail('deqp/functional/gles3/framebufferblit/' + | 
| 'default_framebuffer_04.html', | 
| -        ['win', 'intel'], bug=680797) | 
| +        ['win', 'intel', 'd3d11'], bug=680797) | 
| self.Fail('deqp/functional/gles3/framebufferblit/' + | 
| 'default_framebuffer_06.html', | 
| -        ['win', 'intel'], bug=680797) | 
| +        ['win', 'intel', 'd3d11'], bug=680797) | 
|  | 
| # It's unfortunate that these suppressions need to be so broad, but it | 
| # looks like the D3D11 device can be lost spontaneously on this | 
| # configuration while running basically any test. | 
| -    self.Flaky('conformance/*', ['win', 'intel'], bug=628395) | 
| -    self.Flaky('conformance2/*', ['win', 'intel'], bug=628395) | 
| -    self.Flaky('deqp/*', ['win', 'intel'], bug=628395) | 
| +    self.Flaky('conformance/*', ['win', 'intel', 'd3d11'], bug=628395) | 
| +    self.Flaky('conformance2/*', ['win', 'intel', 'd3d11'], bug=628395) | 
| +    self.Flaky('deqp/*', ['win', 'intel', 'd3d11'], bug=628395) | 
|  | 
| # Mac only. | 
|  | 
| @@ -192,6 +198,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations): | 
| ['mac'], bug=630800) | 
| self.Fail('deqp/functional/gles3/fbocompleteness.html', | 
| ['mac'], bug=630800) | 
| +    self.Fail('deqp/functional/gles3/sync.html', ['mac'], bug=676848) | 
| # self.Fail('deqp/functional/gles3/fbocompleteness.html', | 
| #     ['mac', ('nvidia', 0xfe9)], bug=616562) | 
|  | 
|  |