Add predfined configs for msaa4, nvpr4, nvpr4dit, and srgb that explictly use OpenGL rather than GLES and use them on the X1 bot
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1853103003
Committed: https://skia.googlesource.com/skia/+/74cb44dee50b5db94c1374cbcf0b0a1babd09d89
Review URL: https://codereview.chromium.org/1853103003
diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp
index f718994..301f6a2 100644
--- a/tests/TestConfigParsing.cpp
+++ b/tests/TestConfigParsing.cpp
@@ -58,10 +58,16 @@
ParseConfigs(config1, &configs);
REPORTER_ASSERT(reporter, configs.count() == 1);
REPORTER_ASSERT(reporter, configs[0]->getTag().equals("gpu"));
+
SkCommandLineFlags::StringArray config2 = make_string_array({"8888"});
ParseConfigs(config2, &configs);
REPORTER_ASSERT(reporter, configs.count() == 1);
REPORTER_ASSERT(reporter, configs[0]->getTag().equals("8888"));
+
+ SkCommandLineFlags::StringArray config3 = make_string_array({"gl"});
+ ParseConfigs(config3, &configs);
+ REPORTER_ASSERT(reporter, configs.count() == 1);
+ REPORTER_ASSERT(reporter, configs[0]->getTag().equals("gl"));
}
DEF_TEST(ParseConfigs_DefaultConfigs, reporter) {
@@ -71,7 +77,7 @@
"565", "8888", "debug", "gpu", "gpudebug", "gpudft", "gpunull", "msaa16", "msaa4",
"nonrendering", "null", "nullgpu", "nvpr16", "nvpr4", "nvprdit16", "nvprdit4", "pdf",
"skp", "svg", "xps", "angle", "angle-gl", "commandbuffer", "mesa", "hwui",
- "gpuf16", "gpusrgb"
+ "gpuf16", "gpusrgb", "gl", "glnvpr4", "glnvprdit4", "glsrgb", "glmsaa4"
});
SkCommandLineConfigArray configs;
@@ -141,6 +147,20 @@
#else
REPORTER_ASSERT(reporter, !configs[23]->asConfigGpu());
#endif
+ REPORTER_ASSERT(reporter, configs[27]->asConfigGpu());
+ REPORTER_ASSERT(reporter, configs[28]->asConfigGpu());
+ REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()->getSamples() == 4);
+ REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()->getUseNVPR());
+ REPORTER_ASSERT(reporter, configs[29]->asConfigGpu());
+ REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getSamples() == 4);
+ REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getUseNVPR());
+ REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getUseDIText());
+ REPORTER_ASSERT(reporter, configs[30]->asConfigGpu());
+ REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorType() == kN32_SkColorType);
+ REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getProfileType() ==
+ kSRGB_SkColorProfileType);
+ REPORTER_ASSERT(reporter, configs[31]->asConfigGpu());
+ REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()->getSamples() == 4);
#endif
}
@@ -152,7 +172,8 @@
"gpu(api=mesa,samples=77)",
"gpu(dit=true,api=commandbuffer)",
"gpu()",
- "gpu(api=gles)"
+ "gpu(api=gles)",
+ "gpu(api=gl)"
});
SkCommandLineConfigArray configs;
@@ -203,7 +224,11 @@
REPORTER_ASSERT(reporter, !configs[6]->asConfigGpu()->getUseNVPR());
REPORTER_ASSERT(reporter, !configs[6]->asConfigGpu()->getUseDIText());
REPORTER_ASSERT(reporter, configs[6]->asConfigGpu()->getSamples() == 0);
-
+ REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getContextType() ==
+ GrContextFactory::kGL_GLContextType);
+ REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseNVPR());
+ REPORTER_ASSERT(reporter, !configs[7]->asConfigGpu()->getUseDIText());
+ REPORTER_ASSERT(reporter, configs[7]->asConfigGpu()->getSamples() == 0);
#endif
}