Run the WebGL2 ANGLE tests using the passthrough command decoder on Linux.

BUG=668223

CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel

Change-Id: Icaa5c0f7cf3130770d89b34eb46afbfd8379bee9
Reviewed-on: https://chromium-review.googlesource.com/574688Reviewed-by: Kenneth Russell <kbr@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487488}

content/test/gpu/generate_buildbot_json.py

@@ -1843,28 +1843,6 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
     ],
     'asan_args': ['--is-asan'],
   },
-  'webgl_conformance_angle_tests': {
-    'tester_configs': [
-      {
-        # Run this on the FYI waterfall and optional tryservers.
-        'predicate': Predicates.FYI_AND_OPTIONAL,
-        'os_types': ['linux'],
-        'disabled_instrumentation_types': ['tsan'],
-      }
-    ],
-    'disabled_tester_configs': [
-      {
-        'names': [
-          'Linux ChromiumOS Ozone (Intel)',
-        ],
-      },
-    ],
-    'target_name': 'webgl_conformance',
-    'extra_browser_args': [
-      '--use-gl=angle',
-    ],
-    'asan_args': ['--is-asan'],
-  },
   'webgl_conformance_d3d11_passthrough': {
     'tester_configs': [
       {
@@ -1952,7 +1930,7 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
       'shards': 15,
     },
   },
-  'webgl2_conformance_angle_tests': {
+  'webgl2_conformance_gl_passthrough_tests': {
     'tester_configs': [
       {
          # The WebGL 2.0 conformance tests take over an hour to run on
@@ -1987,6 +1965,8 @@ TELEMETRY_GPU_INTEGRATION_TESTS = {
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-gl=angle',
+      '--use-angle=gl',
+      '--use-passthrough-cmd-decoder',
     ],
     'args': [
       '--webgl-conformance-version=2.0.1',

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

@@ -175,7 +175,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
 
     # Intel HD 530
     self.Fail('conformance2/textures/misc/angle-stuck-depth-textures.html',
-        ['win', 'intel', 'd3d11'], bug=680797)
+        ['win', 'intel', 'no_passthrough', 'd3d11'], bug=680797)
     self.Fail('deqp/functional/gles3/fboinvalidate/format_00.html',
         ['win', 'intel', 'd3d11'], bug=680797)
     self.Fail('deqp/functional/gles3/fboinvalidate/format_01.html',
@@ -203,6 +203,82 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('deqp/functional/gles3/shaderstruct.html',
         ['win', 'passthrough', 'd3d11'], bug=602688)
 
+    # Passthrough command decoder / OpenGL
+    self.Fail('conformance/extensions/webgl-compressed-texture-s3tc.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/glsl/misc/shader-with-non-reserved-words.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/canvas/*', ['passthrough', 'opengl'],
+        bug=602688)
+    self.Fail('conformance/textures/canvas_sub_rectangle/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/image_bitmap_from_blob/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/image_bitmap_from_canvas/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/image_bitmap_from_image/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/image_bitmap_from_image_bitmap/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/image_bitmap_from_image_data/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/misc/' +
+        'copytexsubimage2d-large-partial-copy-corruption.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/misc/copytexsubimage2d-subrects.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/misc/gl-teximage.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/misc/texture-mips.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance/textures/webgl_canvas/*', ['passthrough', 'opengl'],
+        bug=602688)
+    self.Fail('conformance1/textures/image_bitmap_from_image/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/misc/uninitialized-test-2.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/reading/format-r11f-g11f-b10f.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/rendering/blitframebuffer-filter-outofbounds.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/rendering/draw-buffers-dirty-state-bug.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/rendering/framebuffer-unsupported.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/state/gl-get-calls.html', ['passthrough', 'opengl'],
+        bug=602688)
+    self.Fail('conformance2/textures/canvas/*', ['passthrough', 'opengl'],
+        bug=602688)
+    self.Fail('conformance2/textures/canvas_sub_rectangle/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/image_bitmap_from_blob/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/image_bitmap_from_canvas/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/image_bitmap_from_image/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/image_bitmap_from_image_bitmap/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/image_bitmap_from_image_data/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/image_bitmap_from_video/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/misc/angle-stuck-depth-textures.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/misc/' +
+        'tex-image-with-bad-args-from-dom-elements.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/misc/tex-storage-2d.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/video/tex-2d-rgb9_e5-rgb-float.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/video/tex-2d-rgb9_e5-rgb-half_float.html',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('conformance2/textures/webgl_canvas/*',
+        ['passthrough', 'opengl'], bug=602688)
+    self.Fail('deqp/functional/gles3/integerstatequery.html',
+        ['passthrough', 'opengl'], bug=602688)
+
     # Mac only.
     self.Fail('conformance2/renderbuffers/' +
         'multisampled-depth-renderbuffer-initialization.html',
@@ -484,7 +560,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('conformance2/rendering/framebuffer-texture-level1.html',
         ['mac', 'intel'], bug=680278)
     self.Fail('conformance2/textures/misc/angle-stuck-depth-textures.html',
-        ['mac', 'intel'], bug=679692)
+        ['mac', 'no_passthrough', 'intel'], bug=679692)
     self.Fail('deqp/functional/gles3/fbomultisample*',
         ['mac', 'intel'], bug=641209)
     self.Fail('deqp/functional/gles3/texturefiltering/2d_combinations_01.html',
@@ -597,7 +673,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['linux', ('nvidia', 0xf02)], bug=680282)
     self.Flaky('conformance2/textures/image_bitmap_from_image_data/' +
         'tex-2d-srgb8-rgb-unsigned_byte.html',
-        ['linux', 'nvidia'], bug=694354)
+        ['linux', 'no_passthrough', 'nvidia'], bug=694354)
 
     # Linux NVIDIA Quadro P400
     # This test causes a lost device and then the next test fails.
@@ -642,7 +718,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     self.Fail('conformance/extensions/webgl-compressed-texture-astc.html',
         ['linux', 'intel'], bug=680720)
     self.Fail('conformance2/rendering/blitframebuffer-filter-outofbounds.html',
-        ['linux', 'intel'], bug=680720)
+        ['linux', 'no_passthrough', 'intel'], bug=680720)
     self.Fail('conformance2/rendering/blitframebuffer-filter-srgb.html',
         ['linux', 'intel', 'no_angle'], bug=680720)
     self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html',
@@ -726,7 +802,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
         ['linux', 'amd'], bug=483282)
 
     self.Fail('conformance2/misc/uninitialized-test-2.html',
-        ['linux', 'amd'], bug=483282)
+        ['linux', 'no_passthrough', 'amd'], bug=483282)
     self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('conformance2/rendering/blitframebuffer-filter-srgb.html',
@@ -880,7 +956,7 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
     # self.Fail('conformance2/extensions/ext-color-buffer-float.html',
     #     ['linux', 'amd'], bug=633022)
     self.Fail('conformance2/rendering/blitframebuffer-filter-outofbounds.html',
-        ['linux', 'amd'], bug=655147)
+        ['linux', 'no_passthrough', 'amd'], bug=655147)
 
     self.Fail('conformance2/textures/misc/tex-base-level-bug.html',
         ['linux', 'amd'], bug=705865)

testing/buildbot/chromium.gpu.fyi.json

@@ -2747,30 +2747,6 @@
           ]
         }
       },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=debug",
-          "--passthrough",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false,
-          "dimension_sets": [
-            {
-              "gpu": "8086:1912",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
       {
         "args": [
           "webgl_conformance",
@@ -3178,30 +3154,6 @@
           ]
         }
       },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=debug",
-          "--passthrough",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "10de:104a",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
       {
         "args": [
           "webgl_conformance",
@@ -3842,30 +3794,6 @@
           "shards": 15
         }
       },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "--passthrough",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false,
-          "dimension_sets": [
-            {
-              "gpu": "1002:6613",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
       {
         "args": [
           "webgl_conformance",
@@ -4294,12 +4222,12 @@
           "--browser=release",
           "--passthrough",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder",
           "--webgl-conformance-version=2.0.1",
           "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl2_conformance_angle_tests",
+        "name": "webgl2_conformance_gl_passthrough_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test"
         ],
@@ -4341,30 +4269,6 @@
           "shards": 15
         }
       },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "--passthrough",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false,
-          "dimension_sets": [
-            {
-              "gpu": "8086:1912",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
       {
         "args": [
           "webgl_conformance",
@@ -4813,30 +4717,6 @@
           "shards": 15
         }
       },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "--passthrough",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false,
-          "dimension_sets": [
-            {
-              "gpu": "8086:5912",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
       {
         "args": [
           "webgl_conformance",
@@ -5285,30 +5165,6 @@
           "shards": 15
         }
       },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "--passthrough",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": false,
-          "dimension_sets": [
-            {
-              "gpu": "10de:1cb3",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
       {
         "args": [
           "webgl_conformance",
@@ -5817,12 +5673,12 @@
           "--browser=release",
           "--passthrough",
           "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-passthrough-cmd-decoder",
           "--webgl-conformance-version=2.0.1",
           "--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
         ],
         "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl2_conformance_angle_tests",
+        "name": "webgl2_conformance_gl_passthrough_tests",
         "override_compile_targets": [
           "telemetry_gpu_integration_test"
         ],
@@ -5864,30 +5720,6 @@
           "shards": 15
         }
       },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "--passthrough",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "10de:104a",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
       {
         "args": [
           "webgl_conformance",
@@ -11317,30 +11149,6 @@
           "shards": 15
         }
       },
-      {
-        "args": [
-          "webgl_conformance",
-          "--show-stdout",
-          "--browser=release",
-          "--passthrough",
-          "-v",
-          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle"
-        ],
-        "isolate_name": "telemetry_gpu_integration_test",
-        "name": "webgl_conformance_angle_tests",
-        "override_compile_targets": [
-          "telemetry_gpu_integration_test"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "gpu": "10de:104a",
-              "os": "Ubuntu"
-            }
-          ]
-        }
-      },
       {
         "args": [
           "webgl_conformance",