aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-10-31 11:59:52 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-10-31 16:43:24 +0000
commit5b9a037bf41591e0076843f619ee47c9ad30e42d (patch)
tree72a16cab98209b9de87dd94ed4ec2eb41e985f73 /infra
parentb1fc36829de69da5376019403fdd649c06f4cf1b (diff)
gbr- has been brg- this whole time...
Rewrite things to make that a little clearer. A red pixel ends up in channel 2, what would naively draw as blue without a rotation. A green pixel ends up in channel 0, which would naively draw as red without rotation. A blue pixel ends up in channel 1, which would naively draw as green without this rotation. So this transformation is: r -> b g -> r b -> g i.e. rgb_to_brg Change-Id: I12331ff2622194e34a44f421f656fbe4db5d3dca Reviewed-on: https://skia-review.googlesource.com/65521 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json6
-rw-r--r--infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json6
-rw-r--r--infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json6
-rw-r--r--infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN_float_cast_overflow.json6
-rw-r--r--infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json6
-rw-r--r--infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json6
-rw-r--r--infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json6
-rw-r--r--infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json6
-rw-r--r--infra/bots/recipes/test.expected/failed_dm.json6
-rw-r--r--infra/bots/recipes/test.expected/trybot.json6
-rw-r--r--infra/bots/recipes/test.py6
11 files changed, 33 insertions, 33 deletions
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
index 022147c63d..fe6574ec3b 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
@@ -168,7 +168,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -187,11 +187,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
index 8ac71887e8..1d98e1a92d 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
@@ -167,7 +167,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -181,11 +181,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
index 69b1fbb26c..2e3609cae2 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
@@ -239,7 +239,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -253,11 +253,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN_float_cast_overflow.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN_float_cast_overflow.json
index a1094a9f37..fe976d2cff 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN_float_cast_overflow.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-UBSAN_float_cast_overflow.json
@@ -168,7 +168,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -182,11 +182,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
index 079594d7d0..5d0e0d028a 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
@@ -173,7 +173,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -187,11 +187,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
index 74f3fb5bd0..473e00546f 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
@@ -168,7 +168,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -182,11 +182,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json
index 96c8077332..5c348e9f2f 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86-Debug-All.json
@@ -237,7 +237,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -251,11 +251,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json
index 44b405ac10..2d50d3c424 100644
--- a/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json
+++ b/infra/bots/recipes/test.expected/Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Debug-All.json
@@ -235,7 +235,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -249,11 +249,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json
index b5eac8e755..ac594a05e8 100644
--- a/infra/bots/recipes/test.expected/failed_dm.json
+++ b/infra/bots/recipes/test.expected/failed_dm.json
@@ -235,7 +235,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -249,11 +249,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json
index 10eb6aa09c..f67e27ff6a 100644
--- a/infra/bots/recipes/test.expected/trybot.json
+++ b/infra/bots/recipes/test.expected/trybot.json
@@ -236,7 +236,7 @@
"sp-8888",
"2ndpic-8888",
"lite-8888",
- "gbr-8888",
+ "brg-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -250,11 +250,11 @@
"_",
"_",
"dstreadshuffle",
- "gbr-8888",
+ "brg-8888",
"image",
"_",
"_",
- "gbr-8888",
+ "brg-8888",
"colorImage",
"_",
"_",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 023afb7c81..ac3f8bd097 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -95,7 +95,7 @@ def dm_flags(api, bot):
configs.extend(['f16'])
configs.extend(['sp-8888', '2ndpic-8888']) # Test niche uses of SkPicture.
configs.extend(['lite-8888']) # Experimental display list.
- configs.extend(['gbr-8888'])
+ configs.extend(['brg-8888'])
# NP is running out of RAM when we run all these modes. skia:3255
if 'NexusPlayer' not in bot:
@@ -272,8 +272,8 @@ def dm_flags(api, bot):
blacklist('glessrgb image _ _')
# Not any point to running these.
- blacklist('gbr-8888 image _ _')
- blacklist('gbr-8888 colorImage _ _')
+ blacklist('brg-8888 image _ _')
+ blacklist('brg-8888 colorImage _ _')
if 'Valgrind' in bot:
# These take 18+ hours to run.