mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Command-line: Give better error messages. From #1829.

Browse Source
This commit is contained in:
John Kessenich 2019-12-20 10:33:13 -07:00
parent ebf634bcaa
commit bd97b6f9f2
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
StandAlone/StandAlone.cpp
View File

@ -292,9 +292,12 @@ bool SetConfigFile(const std::string& name)
// //
// Give error and exit with failure code. // Give error and exit with failure code.
// //
void Error(const char* message) void Error(const char* message, const char* detail = nullptr)
{ {
fprintf(stderr, "%s: Error %s (use -h for usage)\n", ExecutableName, message); fprintf(stderr, "%s: Error: ", ExecutableName);
if (detail != nullptr)
fprintf(stderr, "%s: ", detail);
fprintf(stderr, "%s (use -h for usage)\n", message);
exit(EFailUsage); exit(EFailUsage);
} }
@ -482,7 +485,7 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
Options |= EOptionAutoMapLocations; Options |= EOptionAutoMapLocations;
} else if (lowerword == "uniform-base") { } else if (lowerword == "uniform-base") {
if (argc <= 1) if (argc <= 1)
Error("no <base> provided for --uniform-base"); Error("no <base> provided", lowerword.c_str());
uniformBase = ::strtol(argv[1], NULL, 10); uniformBase = ::strtol(argv[1], NULL, 10);
bumpArg(); bumpArg();
break; break;
@ -493,15 +496,16 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
else if (strcmp(argv[1], "opengl100") == 0) else if (strcmp(argv[1], "opengl100") == 0)
setOpenGlSpv(); setOpenGlSpv();
else else
Error("--client expects vulkan100 or opengl100"); Error("expects vulkan100 or opengl100", lowerword.c_str());
} } else
Error("expects vulkan100 or opengl100", lowerword.c_str());
bumpArg(); bumpArg();
} else if (lowerword == "dump-builtin-symbols") { } else if (lowerword == "dump-builtin-symbols") {
DumpBuiltinSymbols = true; DumpBuiltinSymbols = true;
} else if (lowerword == "entry-point") { } else if (lowerword == "entry-point") {
entryPointName = argv[1]; entryPointName = argv[1];
if (argc <= 1) if (argc <= 1)
Error("no <name> provided for --entry-point"); Error("no <name> provided", lowerword.c_str());
bumpArg(); bumpArg();
} else if (lowerword == "flatten-uniform-arrays" || // synonyms } else if (lowerword == "flatten-uniform-arrays" || // synonyms
lowerword == "flatten-uniform-array" || lowerword == "flatten-uniform-array" ||
@ -576,7 +580,7 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
} else if (lowerword == "source-entrypoint" || // synonyms } else if (lowerword == "source-entrypoint" || // synonyms
lowerword == "sep") { lowerword == "sep") {
if (argc <= 1) if (argc <= 1)
Error("no <entry-point> provided for --source-entrypoint"); Error("no <entry-point> provided", lowerword.c_str());
sourceEntryPointName = argv[1]; sourceEntryPointName = argv[1];
bumpArg(); bumpArg();
break; break;
@ -627,14 +631,14 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
lowerword == "vn") { lowerword == "vn") {
Options |= EOptionOutputHexadecimal; Options |= EOptionOutputHexadecimal;
if (argc <= 1) if (argc <= 1)
Error("no <C-variable-name> provided for --variable-name"); Error("no <C-variable-name> provided", lowerword.c_str());
variableName = argv[1]; variableName = argv[1];
bumpArg(); bumpArg();
break; break;
} else if (lowerword == "version") { } else if (lowerword == "version") {
Options |= EOptionDumpVersions; Options |= EOptionDumpVersions;
} else { } else {
usage(); Error("unrecognized command-line option", argv[0]);
} }
} }
break; break;
@ -760,7 +764,7 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
Options |= EOptionOutputHexadecimal; Options |= EOptionOutputHexadecimal;
break; break;
default: default:
usage(); Error("unrecognized command-line option", argv[0]);
break; break;
} }
} else { } else {
@ -1263,7 +1267,7 @@ int singleMain()
ProcessConfigFile(); ProcessConfigFile();
if ((Options & EOptionReadHlsl) && !((Options & EOptionOutputPreprocessed) || (Options & EOptionSpv))) if ((Options & EOptionReadHlsl) && !((Options & EOptionOutputPreprocessed) || (Options & EOptionSpv)))
Error("ERROR: HLSL requires SPIR-V code generation (or preprocessing only)"); Error("HLSL requires SPIR-V code generation (or preprocessing only)");
// //
// Two modes: // Two modes: