Update robust read pixels to output number of columns and rows written.

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 1847 matching lines @@
       {
         'names': [
           'Linux ChromiumOS Ozone (Intel)',
         ],
       },
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-angle=d3d11',
       '--use-passthrough-cmd-decoder',
-      # TODO(geofflang): Remove --disable-es3-apis once crbug.com/671217 is
-      # complete.
-      '--disable-es3-apis',
-      # TODO(geofflang): --disable-es3-gl-context is required because of
-      # crbug.com/680522
-      '--disable-es3-gl-context',
     ],
     'asan_args': ['--is-asan'],
   },
   'webgl_conformance_gl_passthrough': {
     'tester_configs': [
       {
         # Run this on the FYI waterfall and optional tryservers.
         'predicate': Predicates.FYI_AND_OPTIONAL,
         'os_types': ['linux'],
         'disabled_instrumentation_types': ['tsan'],
@@ skipping 125 matching lines @@
       {
         'names': [
           'Linux ChromiumOS Ozone (Intel)',
         ],
       },
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-angle=gl',
     ],
+  },
+  'webgl2_conformance_d3d11_passthrough_tests': {
+    'tester_configs': [
+      {
+         # The WebGL 2.0 conformance tests take over an hour to run on
+         # the Debug bots, which is too long.
+        'build_configs': ['Release'],
+        'predicate': Predicates.FYI_ONLY,
+        # Only run on the NVIDIA Release Windows bots.
+        'swarming_dimension_sets': [
+          {
+            'gpu': '10de:104a',
+            'os': 'Windows-2008ServerR2-SP1'
+          },
+        ],
+        'disabled_instrumentation_types': ['tsan'],
+      },
+    ],
+    'target_name': 'webgl_conformance',
+    'extra_browser_args': [
+      '--use-angle=d3d11',
+      '--use-passthrough-cmd-decoder',
+    ],
     'args': [
       '--webgl-conformance-version=2.0.1',
       # The current working directory when run via isolate is
       # out/Debug or out/Release. Reference this file relatively to
       # it.
       '--read-abbreviated-json-results-from=' + \
       '../../content/test/data/gpu/webgl2_conformance_tests_output.json',
     ],
     'asan_args': ['--is-asan'],
     'swarming': {
@@ skipping 350 matching lines @@
   install_parent_links(WATERFALL)
   install_parent_links(V8_FYI_WATERFALL)
 
   generate_all_tests(FYI_WATERFALL, 'chromium.gpu.fyi.json')
   generate_all_tests(WATERFALL, 'chromium.gpu.json')
   generate_all_tests(V8_FYI_WATERFALL, 'client.v8.fyi.json')
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())