Skip to content

GitLab

T
tangled
Commit 539778cf authored by Jonah Ryan-Davis's avatar Jonah Ryan-Davis Committed by Commit Bot
Browse files
Options

Explicitly name webgl/2 conformance tests on Windows 

These tests should be explicit about using ANGLE's d3d11 backend.

Bug: chromium:850252
Change-Id: I0f3d348edf38f845efeb5ba9d2a70f38b662efbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2302413Reviewed-by: default avatarJonah Ryan-Davis <jonahr@google.com>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
Cr-Commit-Position: refs/heads/master@{#790942}
parent c797286e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 769 additions and 355 deletions
content/test/gpu/gpu_tests/test_expectations/webgl2_conformance_expectations.txt
View file @ 539778cf
......@@ -85,6 +85,7 @@ crbug.com/953120 conformance/programs/program-handling.html [ Failure ]
crbug.com/949249 [ win passthrough opengl nvidia ] conformance2/extensions/ovr_multiview2.html [ Failure ]
crbug.com/949249 [ win passthrough no-use-gl ] conformance2/extensions/ovr_multiview2.html [ Failure ]
crbug.com/949249 [ win passthrough d3d11 ] conformance2/extensions/ovr_multiview2.html [ Failure ]
crbug.com/949249 [ linux passthrough opengl ] conformance2/extensions/ovr_multiview2.html [ Failure ]
# Failing new test
......@@ -180,6 +181,7 @@ crbug.com/1000354 [ win opengles ] conformance2/extensions/ext-texture-norm16.ht
crbug.com/736926 [ win ] conformance2/textures/svg_image/tex-2d-rgb565-rgb-unsigned_short_5_6_5.html [ RetryOnFailure ]
crbug.com/angleproject/3033 [ win no-passthrough ] conformance2/textures/misc/generate-mipmap-with-large-base-level.html [ Failure ]
crbug.com/angleproject/1465 [ win no-use-gl ] conformance2/glsl3/tricky-loop-conditions.html [ Failure ]
crbug.com/angleproject/1465 [ win d3d11 ] conformance2/glsl3/tricky-loop-conditions.html [ Failure ]
# Win / NVidia
crbug.com/631317 [ d3d11 win nvidia ] deqp/functional/gles3/fbomultisample* [ RetryOnFailure ]
......
testing/buildbot/chromium.ci.json
View file @ 539778cf
This diff is collapsed.
testing/buildbot/chromium.gpu.fyi.json
View file @ 539778cf
This diff is collapsed.
testing/buildbot/chromium.gpu.json
View file @ 539778cf
......@@ -4971,15 +4971,14 @@
"--browser=debug_x64",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json"
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d11 --use-cmd-decoder=passthrough --force_high_performance_gpu"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl_conformance_tests",
"name": "webgl_conformance_d3d11_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -5511,8 +5510,7 @@
"--browser=release_x64",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --force_high_performance_gpu",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl_conformance_tests_output.json"
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d11 --use-cmd-decoder=passthrough --force_high_performance_gpu"
],
"isolate_name": "telemetry_gpu_integration_test",
"isolate_profile_data": true,
......@@ -5520,7 +5518,7 @@
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "webgl_conformance_tests",
"name": "webgl_conformance_d3d11_passthrough_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
......
testing/buildbot/test_suites.pyl
View file @ 539778cf
......@@ -2833,6 +2833,26 @@
},
},
'gpu_webgl2_conformance_d3d11_passthrough_telemetry_tests': {
'webgl2_conformance_d3d11_passthrough_tests': {
'telemetry_test_name': 'webgl_conformance',
'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',
# On dual-GPU devices we want the high-performance GPU to be active
'--extra-browser-args=--use-gl=angle --use-angle=d3d11 --use-cmd-decoder=passthrough --force_high_performance_gpu',
],
'swarming': {
# These tests currently take about an hour and fifteen minutes
# to run. Split them into roughly 5-minute shards.
'shards': 20,
},
},
},
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests': {
'webgl2_conformance_gl_passthrough_tests': {
'telemetry_test_name': 'webgl_conformance',
......@@ -2919,6 +2939,19 @@
},
},
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests': {
'webgl_conformance_d3d11_passthrough': {
'telemetry_test_name': 'webgl_conformance',
'args': [
# On dual-GPU devices we want the high-performance GPU to be active
'--extra-browser-args=--use-angle=d3d11 --use-cmd-decoder=passthrough --force_high_performance_gpu',
],
'swarming': {
'shards': 2,
},
},
},
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests': {
'webgl_conformance_d3d9_passthrough': {
'telemetry_test_name': 'webgl_conformance',
......@@ -5142,11 +5175,11 @@
'gpu_angle_win_intel_nvidia_telemetry_tests': [
'gpu_info_collection_telemetry_tests',
'gpu_webgl2_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
],
......@@ -5176,7 +5209,7 @@
'gpu_common_win_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
'gpu_gl_renderer_small_telemetry_tests',
],
......@@ -5402,9 +5435,9 @@
'gpu_fyi_win_debug_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
],
......@@ -5425,11 +5458,11 @@
'gpu_fyi_win_intel_release_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_passthrough_telemetry_tests',
'gpu_webgl2_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
'gpu_win_intel_specific_telemetry_tests',
],
......@@ -5437,10 +5470,11 @@
'gpu_fyi_win_nvidia_amd_release_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_passthrough_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl2_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
],
......@@ -5457,11 +5491,11 @@
'gpu_fyi_win_release_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_passthrough_telemetry_tests',
'gpu_webgl2_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
],
......@@ -5481,20 +5515,22 @@
'gpu_optional_win_intel_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl2_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
'gpu_win_intel_specific_telemetry_tests',
],
'gpu_optional_win_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl2_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
],
......@@ -5529,8 +5565,8 @@
],
'gpu_win_angle_amd_telemetry_tests': [
'gpu_webgl_conformance_d3d11_passthrough_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment