diff options
| author |  Brian Osman <brianosman@google.com> | 2018-03-02 11:01:10 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-02 18:19:50 +0000 |
| commit | 10fc6fddf24878f4f34e75c1bcc11e4499edfcc0 (patch) | |
| tree | b3bd1d9263dbcf53c688d412e1e719fa97674b23 /infra | |
| parent | fde6fa0903b3cedc463c1a753268ffcf30ad7a38 (diff) | |
Revert "Revert "Add 1010102 support to Ganesh""
This reverts commit ded47a50143470d1acdafa03e878cc7da5608038.
Bug: skia:
Change-Id: I7d7552e6ccc8591cae91426407ab13b628b93b68
Reviewed-on: https://skia-review.googlesource.com/111760
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'infra')
5 files changed, 11 insertions, 0 deletions
diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json index 95092be02b..e6711e9c02 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json @@ -164,6 +164,7 @@ "--nocpu", "--config", "vk", + "vk1010102", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json index 6b351265b6..38939f214e 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -169,6 +169,7 @@ "gldft", "glsrgb", "glmsaa8", + "gl1010102", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json index cfff7ae3f4..5eb98b88a1 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json @@ -169,6 +169,7 @@ "gldft", "glsrgb", "glmsaa8", + "gl1010102", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json index 4f0ad74cc1..0cf53f2028 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json @@ -169,6 +169,7 @@ "gldft", "glsrgb", "glmsaa8", + "gl1010102", "--src", "tests", "gm", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 4115043cb7..5cc7c94434 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -212,6 +212,13 @@ def dm_flags(api, bot): if 'Vulkan' in bot: configs = ['vk'] + # Test 1010102 on our Linux/NVIDIA bots + if 'QuadroP400' in bot and api.vars.is_linux: + if 'Vulkan' in bot: + configs.append('vk1010102') + else: + configs.append('gl1010102') + if 'ChromeOS' in bot: # Just run GLES for now - maybe add gles_msaa4 in the future configs = ['gles'] |