From 419abf335af36cc9928019bbd9c075944ae59a0a Mon Sep 17 00:00:00 2001
From: Brian Osman <brianosman@google.com>
Date: Fri, 2 Mar 2018 14:56:15 -0500
Subject: [PATCH] Blacklist image sources with 1010102 configs

It's not clear that we should ever decode to this format.

Bug: skia:7686
Change-Id: I9f2cc6e72d89d06bf9491d695b4f64b99bfa0392
Reviewed-on: https://skia-review.googlesource.com/111841
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
---
 ...-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_Coverage.json | 4 ++++
 ...ase-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41.json | 4 ++++
 ...-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41.json | 4 ++++
 ...roP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41.json | 4 ++++
 infra/bots/recipes/test.py                                    | 4 ++++
 5 files changed, 20 insertions(+)

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 e6711e9c02..79dc56cdc2 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
@@ -172,6 +172,10 @@
       "colorImage",
       "svg",
       "--blacklist",
+      "vk1010102",
+      "image",
+      "_",
+      "_",
       "_",
       "svg",
       "_",
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 38939f214e..326d59940e 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
@@ -177,6 +177,10 @@
       "colorImage",
       "svg",
       "--blacklist",
+      "gl1010102",
+      "image",
+      "_",
+      "_",
       "_",
       "svg",
       "_",
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 5eb98b88a1..e9e33463dd 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
@@ -177,6 +177,10 @@
       "colorImage",
       "svg",
       "--blacklist",
+      "gl1010102",
+      "image",
+      "_",
+      "_",
       "_",
       "svg",
       "_",
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 0cf53f2028..cadca55fd9 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
@@ -177,6 +177,10 @@
       "colorImage",
       "svg",
       "--blacklist",
+      "gl1010102",
+      "image",
+      "_",
+      "_",
       "_",
       "svg",
       "_",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 5cc7c94434..eb81a9c8a9 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -216,8 +216,12 @@ def dm_flags(api, bot):
     if 'QuadroP400' in bot and api.vars.is_linux:
       if 'Vulkan' in bot:
         configs.append('vk1010102')
+        # Decoding transparent images to 1010102 just looks bad
+        blacklist('vk1010102 image _ _')
       else:
         configs.append('gl1010102')
+        # Decoding transparent images to 1010102 just looks bad
+        blacklist('gl1010102 image _ _')
 
     if 'ChromeOS' in bot:
       # Just run GLES for now - maybe add gles_msaa4 in the future