diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-06-22 09:56:24 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-23 14:05:20 +0000 |
| commit | 8c86588d1bcc585b94a4ba001f8d274be7018a22 (patch) | |
| tree | 9a7794fa7bb9ba19adc7e226734d62f42af646fe | |
| parent | 6cdb5f2ad7684302a8a66217462d2aef4c5f4632 (diff) | |
Add correctness testing for ANGLE D3D11 ES3
Bug=skia:6776
Change-Id: I51c851d6b80992039c87ae43037721db52958f0c
Reviewed-on: https://skia-review.googlesource.com/20503
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
4 files changed, 8 insertions, 1 deletions
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json index 3a64a0cea4..6839497b9d 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json @@ -270,6 +270,7 @@ "angle_d3d11_es2", "angle_d3d9_es2", "angle_gl_es2", + "angle_d3d11_es3", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json index 399bdc7be0..bcb5fe7161 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -270,7 +270,9 @@ "angle_d3d11_es2", "angle_d3d9_es2", "angle_gl_es2", + "angle_d3d11_es3", "angle_d3d11_es2_msaa8", + "angle_d3d11_es3_msaa8", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index ef083a18f2..7dc3873088 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -129,9 +129,11 @@ def dm_flags(bot): if 'ANGLE' in bot: configs = ['angle_d3d11_es2', 'angle_d3d9_es2', - 'angle_gl_es2'] + 'angle_gl_es2', + 'angle_d3d11_es3'] if sample_count is not '': configs.append('angle_d3d11_es2_msaa' + sample_count) + configs.append('angle_d3d11_es3_msaa' + sample_count) # Vulkan bot *only* runs the vk config. if 'Vulkan' in bot: diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index 458962e007..6e5581029f 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -77,6 +77,8 @@ static const struct { { "angle_d3d9_es2", "gpu", "api=angle_d3d9_es2" }, { "angle_d3d11_es2_msaa4", "gpu", "api=angle_d3d11_es2,samples=4" }, { "angle_d3d11_es2_msaa8", "gpu", "api=angle_d3d11_es2,samples=8" }, + { "angle_d3d11_es3_msaa4", "gpu", "api=angle_d3d11_es3,samples=4" }, + { "angle_d3d11_es3_msaa8", "gpu", "api=angle_d3d11_es3,samples=8" }, { "angle_gl_es2", "gpu", "api=angle_gl_es2" }, { "angle_gl_es3", "gpu", "api=angle_gl_es3" }, { "commandbuffer", "gpu", "api=commandbuffer" } |