AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove "srgb" config from DM,nanobench

Browse Source 
Now that "srgb" is broken I don't want to accidentally run it.
"srgbnl" if of course identical, and not broken so much as
simply not yet working.  :)

While here, simplify the configs we run in nanobench too, eliminating
565 and moving F16 to GCE-only (i.e. fast, abundant machines).

Similarly, remove "adobe" VIA that doesn't use Adobe RGB correctly...

Change-Id: Ic295dec97a2caadadbe8500655243db36dd2c43d
Reviewed-on: https://skia-review.googlesource.com/132932
Commit-Queue: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
Mike Klein 2018-06-07 14:46:07 -04:00 committed by Skia Commit-Bot
parent fa8ff09457
commit 6120164138
11 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bench/nanobench.cpp
View File

@ -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)

9
dm/DM.cpp
View File

@ -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);

2
infra/bots/recipes/perf.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
View File

@ -150,8 +150,6 @@
"8888",
"nonrendering",
"f16",
"srgb",
"565",
"--match",
"~^floor2int_undef$",
"~inc0.gif",

6
infra/bots/recipes/perf.py
View File

@ -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')

1
infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
View File

@ -184,7 +184,6 @@
"f16",
"lite-8888",
"gbr-8888",
"srgb",
"srgbnl",
"esrgb",
"t8888",

1
infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
View File

@ -183,7 +183,6 @@
"f16",
"lite-8888",
"gbr-8888",
"srgb",
"srgbnl",
"esrgb",
"t8888",

1
infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json
View File

@ -266,7 +266,6 @@
"f16",
"lite-8888",
"gbr-8888",
"srgb",
"srgbnl",
"esrgb",
"serialize-8888",

1
infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-shard_00_10-Coverage.json
View File

@ -189,7 +189,6 @@
"f16",
"lite-8888",
"gbr-8888",
"srgb",
"srgbnl",
"esrgb",
"serialize-8888",

1
infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-TSAN.json
View File

@ -184,7 +184,6 @@
"f16",
"lite-8888",
"gbr-8888",
"srgb",
"srgbnl",
"esrgb",
"t8888",

1
infra/bots/recipes/test.expected/failed_dm.json
View File

@ -262,7 +262,6 @@
"f16",
"lite-8888",
"gbr-8888",
"srgb",
"srgbnl",
"esrgb",
"serialize-8888",

1
infra/bots/recipes/test.py
View File

@ -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'])