diff options
11 files changed, 1 insertions, 26 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 4d2773e605..f77299fece 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -478,9 +478,6 @@ static void create_config(const SkCommandLineConfig* config, SkTArray<Config>* c kN32_SkColorType, kPremul_SkAlphaType, nullptr) CPU_CONFIG(565, kRaster_Backend, kRGB_565_SkColorType, kOpaque_SkAlphaType, nullptr) - auto srgbColorSpace = SkColorSpace::MakeSRGB(); - CPU_CONFIG(srgb, kRaster_Backend, - kN32_SkColorType, kPremul_SkAlphaType, srgbColorSpace) auto srgbLinearColorSpace = SkColorSpace::MakeSRGBLinear(); CPU_CONFIG(f16, kRaster_Backend, kRGBA_F16_SkColorType, kPremul_SkAlphaType, srgbLinearColorSpace) @@ -916,26 +916,17 @@ static Sink* create_sink(const GrContextOptions& grCtxOptions, const SkCommandLi SINK("pdfa", PDFSink, true, SK_ScalarDefaultRasterDPI); SINK("pdf300", PDFSink, false, 300); SINK("jsdebug", DebugSink); - - // TODO: kRGBA_sRGB_SkColorType / srgbLinearColorSpace? - SINK("srgb", RasterSink, kN32_SkColorType, srgbColorSpace); } #undef SINK return nullptr; } -static sk_sp<SkColorSpace> adobe_rgb() { - return SkColorSpace::MakeRGB(SkColorSpace::kSRGB_RenderTargetGamma, - SkColorSpace::kAdobeRGB_Gamut); -} - static sk_sp<SkColorSpace> rgb_to_gbr() { return SkColorSpace::MakeSRGB()->makeColorSpin(); } static Sink* create_via(const SkString& tag, Sink* wrapped) { #define VIA(t, via, ...) if (tag.equals(t)) { return new via(__VA_ARGS__); } - VIA("adobe", ViaCSXform, wrapped, adobe_rgb(), false); VIA("gbr", ViaCSXform, wrapped, rgb_to_gbr(), true); VIA("lite", ViaLite, wrapped); VIA("pipe", ViaPipe, wrapped); diff --git a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json index a305a986b0..ef18e8fc56 100644 --- a/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json +++ b/infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json @@ -150,8 +150,6 @@ "8888", "nonrendering", "f16", - "srgb", - "565", "--match", "~^floor2int_undef$", "~inc0.gif", diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index db7a96729f..da9afbf3fd 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -60,12 +60,8 @@ def nanobench_flags(api, bot): args.append('--nogpu') configs.extend(['8888', 'nonrendering']) - if '-arm-' not in bot: - # For Android CPU tests, these take too long and cause the task to time - # out. - configs += [ 'f16', 'srgb' ] if '-GCE-' in bot: - configs += [ '565' ] + configs += [ 'f16' ] elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU': args.append('--nocpu') 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 2e3a57a7e6..8f3549533d 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 @@ -184,7 +184,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "t8888", 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 88d4a45b3b..f00cfeb3c6 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 @@ -183,7 +183,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "t8888", 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 0f1934c743..ccbc17b215 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 @@ -266,7 +266,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "serialize-8888", 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 1aef121663..f499bc0bb6 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 @@ -189,7 +189,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "serialize-8888", 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 8aa3934778..45d7adf0de 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 @@ -184,7 +184,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "t8888", diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json index 458f9a2149..5a0d0969cb 100644 --- a/infra/bots/recipes/test.expected/failed_dm.json +++ b/infra/bots/recipes/test.expected/failed_dm.json @@ -262,7 +262,6 @@ "f16", "lite-8888", "gbr-8888", - "srgb", "srgbnl", "esrgb", "serialize-8888", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index f41955009c..53ae495c92 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -118,7 +118,6 @@ def dm_flags(api, bot): configs.extend(['f16']) configs.extend(['lite-8888']) # Experimental display list. configs.extend(['gbr-8888']) - configs.extend(['srgb']) configs.extend(['srgbnl']) configs.extend(['esrgb']) |