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

Remove g8 config from DM/FM. Switch CPU bots to test r8 instead.

Browse Source 
Change-Id: I1bef9f9c8db0147d8cfb60354aa519cc3ca61b43
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/507319
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2022-02-10 15:42:21 -05:00 committed by SkCQ
parent c0fcc50344
commit 1bd59cf10b
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dm/DM.cpp
View File

@ -988,7 +988,6 @@ static Sink* create_sink(const GrContextOptions& grCtxOptions, const SkCommandLi
#define SINK(t, sink, ...) if (config->getBackend().equals(t)) return new sink(__VA_ARGS__) #define SINK(t, sink, ...) if (config->getBackend().equals(t)) return new sink(__VA_ARGS__)
if (FLAGS_cpu) { if (FLAGS_cpu) {
SINK("g8", RasterSink, kGray_8_SkColorType);
SINK("r8", RasterSink, kR8_unorm_SkColorType); SINK("r8", RasterSink, kR8_unorm_SkColorType);
SINK("565", RasterSink, kRGB_565_SkColorType); SINK("565", RasterSink, kRGB_565_SkColorType);
SINK("4444", RasterSink, kARGB_4444_SkColorType); SINK("4444", RasterSink, kARGB_4444_SkColorType);

8
infra/bots/gen_tasks_logic/dm_flags.go
View File

@ -195,7 +195,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
if b.extraConfig("BonusConfigs") { if b.extraConfig("BonusConfigs") {
configs = []string{ configs = []string{
"g8", "565", "r8", "565",
"pic-8888", "serialize-8888", "pic-8888", "serialize-8888",
"linear-f16", "srgb-rgba", "srgb-f16", "narrow-rgba", "narrow-f16", "linear-f16", "srgb-rgba", "srgb-f16", "narrow-rgba", "narrow-f16",
"p3-rgba", "p3-f16", "rec2020-rgba", "rec2020-f16"} "p3-rgba", "p3-f16", "rec2020-rgba", "rec2020-f16"}
@ -630,9 +630,9 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
skip("srgb-gl", "image", ALL, ALL) skip("srgb-gl", "image", ALL, ALL)
skip("srgb-gles", "image", ALL, ALL) skip("srgb-gles", "image", ALL, ALL)
// --src image --config g8 means "decode into Gray8", which isn't supported. // --src image --config r8 means "decode into R8", which isn't supported.
skip("g8", "image", ALL, ALL) skip("r8", "image", ALL, ALL)
skip("g8", "colorImage", ALL, ALL) skip("r8", "colorImage", ALL, ALL)
if b.extraConfig("Valgrind") { if b.extraConfig("Valgrind") {
// These take 18+ hours to run. // These take 18+ hours to run.

2
infra/bots/task_drivers/fm_driver/fm_driver.go
View File

@ -473,7 +473,7 @@ func main() {
run(tests, F{"race": "0"}) // Several unit tests are not reentrant. run(tests, F{"race": "0"}) // Several unit tests are not reentrant.
if model == "GCE" { if model == "GCE" {
run(gms, F{"ct": "g8", "legacy": "true"}) // --config g8 run(gms, F{"ct": "r8", "legacy": "true"}) // --config r8
run(gms, F{"ct": "565", "legacy": "true"}) // --config 565 run(gms, F{"ct": "565", "legacy": "true"}) // --config 565
run(gms, F{"ct": "8888", "legacy": "true"}) // --config 8888 run(gms, F{"ct": "8888", "legacy": "true"}) // --config 8888
run(gms, F{"ct": "f16"}) // --config esrgb run(gms, F{"ct": "f16"}) // --config esrgb

4
infra/bots/tasks.json
View File

File diff suppressed because one or more lines are too long

2
tools/fm/fm.cpp
View File

@ -510,7 +510,7 @@ int main(int argc, char** argv) {
}; };
const FlagOption<SkColorType> kColorTypes[] = { const FlagOption<SkColorType> kColorTypes[] = {
{ "a8", kAlpha_8_SkColorType }, { "a8", kAlpha_8_SkColorType },
{ "g8", kGray_8_SkColorType }, { "r8", kR8_unorm_SkColorType },
{ "565", kRGB_565_SkColorType }, { "565", kRGB_565_SkColorType },
{ "4444", kARGB_4444_SkColorType }, { "4444", kARGB_4444_SkColorType },
{ "8888", kN32_SkColorType }, { "8888", kN32_SkColorType },