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

Use brackets for explicit GPU config params in tools

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2378163003

Review-Url: https://codereview.chromium.org/2378163003
This commit is contained in:
bsalomon 2016-09-28 12:40:22 -07:00 committed by Commit bot
parent 645999fe78
commit 808ecbb135
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tests/TestConfigParsing.cpp
View File

@ -206,15 +206,15 @@ DEF_TEST(ParseConfigs_DefaultConfigs, reporter) {
DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) {
SkCommandLineFlags::StringArray config1 = make_string_array({
"gpu(nvpr=true,dit=false)",
"gpu(api=angle)",
"gpu(api=angle-gl)",
"gpu(api=mesa,samples=77)",
"gpu(dit=true,api=commandbuffer)",
"gpu()",
"gpu(api=gles)",
"gpu(api=gl)",
"gpu(api=vulkan)",
"gpu[nvpr=true,dit=false]",
"gpu[api=angle]",
"gpu[api=angle-gl]",
"gpu[api=mesa,samples=77]",
"gpu[dit=true,api=commandbuffer]",
"gpu[]",
"gpu[api=gles]",
"gpu[api=gl]",
"gpu[api=vulkan]",
});
SkCommandLineConfigArray configs;
@ -278,18 +278,18 @@ DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) {
DEF_TEST(ParseConfigs_ExtendedGpuConfigsIncorrect, reporter) {
SkCommandLineFlags::StringArray config1 = make_string_array({
"gpu(nvpr=1)", // Number as bool.
"gpu(api=gl,)", // Trailing in comma.
"gpu(api=angle-glu)", // Unknown api.
"gpu(api=,samples=0)", // Empty api.
"gpu(samples=true)", // Value true as a number.
"gpu(samples=0,samples=0)", // Duplicate option key.
"gpu(,samples=0)", // Leading comma.
"gpu(samples=54", // Missing closing parenthesis.
"gpu[nvpr=1]", // Number as bool.
"gpu[api=gl,]", // Trailing in comma.
"gpu[api=angle-glu]", // Unknown api.
"gpu[api=,samples=0]", // Empty api.
"gpu[samples=true]", // Value true as a number.
"gpu[samples=0,samples=0]", // Duplicate option key.
"gpu[,samples=0]", // Leading comma.
"gpu[samples=54", // Missing closing parenthesis.
",,",
"gpu(", // Missing parenthesis.
"gpu[", // Missing bracket.
"samples=54" // No backend.
"gpu(nvpr=true )", // Space.
"gpu[nvpr=true ]", // Space.
});
SkCommandLineConfigArray configs;
@ -308,9 +308,9 @@ DEF_TEST(ParseConfigs_ExtendedGpuConfigsSurprises, reporter) {
// These just list explicitly some properties of the system.
SkCommandLineFlags::StringArray config1 = make_string_array({
// Options are not canonized -> two same configs have a different tag.
"gpu(nvpr=true,dit=true)", "gpu(dit=true,nvpr=true)",
"gpu(api=debug)", "gpu(api=gl)", "gpu(api=gles)", ""
"gpu", "gpu()", "gpu(samples=0)", "gpu(api=gles,samples=0)"
"gpu[nvpr=true,dit=true]", "gpu[dit=true,nvpr=true]",
"gpu[api=debug]", "gpu[api=gl]", "gpu[api=gles]", ""
"gpu", "gpu[]", "gpu[samples=0]", "gpu[api=gles,samples=0]"
});
SkCommandLineConfigArray configs;
ParseConfigs(config1, &configs);
@ -363,9 +363,9 @@ DEF_TEST(ParseConfigs_ViaParsing, reporter) {
DEF_TEST(ParseConfigs_ViaParsingExtendedForm, reporter) {
SkCommandLineFlags::StringArray config1 = make_string_array({
"zz-qq-gpu(api=gles)",
"a-gpu(samples=1",
"abc-def-angle-gl(samples=1)",
"zz-qq-gpu[api=gles]",
"a-gpu[samples=1",
"abc-def-angle-gl[samples=1]",
});
SkCommandLineConfigArray configs;
@ -377,11 +377,11 @@ DEF_TEST(ParseConfigs_ViaParsingExtendedForm, reporter) {
#if SK_SUPPORT_GPU
{"gpu", {"zz", "qq", nullptr}},
#else
{"gpu(api=gles)", {"zz", "qq", nullptr}},
{"gpu[api=gles]", {"zz", "qq", nullptr}},
#endif
{"gpu(samples=1", {"a", nullptr, nullptr}}, // This is not extended form, but via still
{"gpu[samples=1", {"a", nullptr, nullptr}}, // This is not extended form, but via still
// works as expected.
{"gl(samples=1)", {"abc", "def", "angle"}} // This is not extended form. Also
{"gl[samples=1]", {"abc", "def", "angle"}} // This is not extended form. Also
// angle-gl is not a "backend" in this case.
};
for (int i = 0; i < config1.count(); ++i) {

10
tools/flags/SkCommonFlagsConfig.cpp
View File

@ -96,7 +96,7 @@ static const char* config_help_fn() {
for (const auto& config : gPredefinedConfigs) {
helpString.appendf(" %s", config.predefinedConfig);
}
helpString.append(" or use extended form 'backend(option=value,...)'.\n");
helpString.append(" or use extended form 'backend[option=value,...]'.\n");
return helpString.c_str();
}
@ -105,7 +105,7 @@ static const char configExtendedHelp[] =
"Possible backends and options:\n"
#if SK_SUPPORT_GPU
"\n"
"gpu(api=string,color=string,dit=bool,nvpr=bool,inst=bool,samples=int)\n"
"gpu[api=string,color=string,dit=bool,nvpr=bool,inst=bool,samples=int]\n"
"\tapi\ttype: string\tdefault: native.\n"
"\t Select graphics API to use with gpu backend.\n"
"\t Options:\n"
@ -382,10 +382,10 @@ void ParseConfigs(const SkCommandLineFlags::StringArray& configs,
SkString tag(configs[i]);
SkTArray<SkString> parts;
SkStrSplit(tag.c_str(), "(", kStrict_SkStrSplitMode, &parts);
SkStrSplit(tag.c_str(), "[", kStrict_SkStrSplitMode, &parts);
if (parts.count() == 2) {
SkTArray<SkString> parts2;
SkStrSplit(parts[1].c_str(), ")", kStrict_SkStrSplitMode, &parts2);
SkStrSplit(parts[1].c_str(), "]", kStrict_SkStrSplitMode, &parts2);
if (parts2.count() == 2 && parts2[1].isEmpty()) {
SkStrSplit(parts[0].c_str(), "-", kStrict_SkStrSplitMode, &vias);
if (vias.count()) {
@ -395,7 +395,7 @@ void ParseConfigs(const SkCommandLineFlags::StringArray& configs,
extendedBackend = parts[0];
}
extendedOptions = parts2[0];
simpleBackend.printf("%s(%s)", extendedBackend.c_str(), extendedOptions.c_str());
simpleBackend.printf("%s[%s]", extendedBackend.c_str(), extendedOptions.c_str());
}
}