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

Infrastructure: Non-functional: rationalize some command-line processing.

Browse Source
This commit is contained in:
John Kessenich 2017-06-23 10:58:31 -06:00
parent 4be4aebdcd
commit c178f0a4d9
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
StandAlone/StandAlone.cpp
View File

@ -157,7 +157,6 @@ std::array<unsigned int, EShLangCount> baseSsboBinding;
std::array<unsigned int, EShLangCount> baseUavBinding; std::array<unsigned int, EShLangCount> baseUavBinding;
std::array<std::vector<std::string>, EShLangCount> baseResourceSetBinding; std::array<std::vector<std::string>, EShLangCount> baseResourceSetBinding;
// Add things like "#define ..." to a preamble to use in the beginning of the shader. // Add things like "#define ..." to a preamble to use in the beginning of the shader.
class TPreamble { class TPreamble {
public: public:
@ -337,6 +336,14 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
ExecutableName = argv[0]; ExecutableName = argv[0];
workItems.reserve(argc); workItems.reserve(argc);
const auto bumpArg = [&]() {
if (argc > 0) {
argc--;
argv++;
}
};
// read a string directly attached to a single-letter option
const auto getStringOperand = [&](const char* desc) { const auto getStringOperand = [&](const char* desc) {
if (argv[0][2] == 0) { if (argv[0][2] == 0) {
printf("%s must immediately follow option (no spaces)\n", desc); printf("%s must immediately follow option (no spaces)\n", desc);
@ -345,9 +352,7 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
return argv[0] + 2; return argv[0] + 2;
}; };
argc--; for (bumpArg(); argc >= 1; bumpArg()) {
argv++;
for (; argc >= 1; argc--, argv++) {
if (argv[0][0] == '-') { if (argv[0][0] == '-') {
switch (argv[0][1]) { switch (argv[0][1]) {
case '-': case '-':
@ -412,22 +417,18 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
ProcessBindingBase(argc, argv, baseSsboBinding); ProcessBindingBase(argc, argv, baseSsboBinding);
} else if (lowerword == "source-entrypoint" || // synonyms } else if (lowerword == "source-entrypoint" || // synonyms
lowerword == "sep") { lowerword == "sep") {
sourceEntryPointName = argv[1]; if (argc <= 1)
if (argc > 0) {
argc--;
argv++;
} else
Error("no <entry-point> provided for --source-entrypoint"); Error("no <entry-point> provided for --source-entrypoint");
sourceEntryPointName = argv[1];
bumpArg();
break; break;
} else if (lowerword == "variable-name" || // synonyms } else if (lowerword == "variable-name" || // synonyms
lowerword == "vn") { lowerword == "vn") {
Options |= EOptionOutputHexadecimal; Options |= EOptionOutputHexadecimal;
variableName = argv[1]; if (argc <= 1)
if (argc > 0) {
argc--;
argv++;
} else
Error("no <C-variable-name> provided for --variable-name"); Error("no <C-variable-name> provided for --variable-name");
variableName = argv[1];
bumpArg();
break; break;
} else { } else {
usage(); usage();
@ -465,12 +466,10 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
IncludeDirectoryList.push_back(getStringOperand("-I<dir> include path")); IncludeDirectoryList.push_back(getStringOperand("-I<dir> include path"));
break; break;
case 'S': case 'S':
shaderStageName = argv[1]; if (argc <= 1)
if (argc > 0) {
argc--;
argv++;
} else
Error("no <stage> specified for -S"); Error("no <stage> specified for -S");
shaderStageName = argv[1];
bumpArg();
break; break;
case 'U': case 'U':
UserPreamble.addUndef(getStringOperand("-U<macro>: macro name")); UserPreamble.addUndef(getStringOperand("-U<macro>: macro name"));
@ -490,11 +489,9 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
// HLSL todo: entry point handle needs much more sophistication. // HLSL todo: entry point handle needs much more sophistication.
// This is okay for one compilation unit with one entry point. // This is okay for one compilation unit with one entry point.
entryPointName = argv[1]; entryPointName = argv[1];
if (argc > 0) { if (argc <= 1)
argc--;
argv++;
} else
Error("no <entry-point> provided for -e"); Error("no <entry-point> provided for -e");
bumpArg();
break; break;
case 'g': case 'g':
Options |= EOptionDebug; Options |= EOptionDebug;
@ -512,12 +509,10 @@ void ProcessArguments(std::vector<std::unique_ptr<glslang::TWorkItem>>& workItem
Options |= EOptionMemoryLeakMode; Options |= EOptionMemoryLeakMode;
break; break;
case 'o': case 'o':
binaryFileName = argv[1]; if (argc <= 1)
if (argc > 0) {
argc--;
argv++;
} else
Error("no <file> provided for -o"); Error("no <file> provided for -o");
binaryFileName = argv[1];
bumpArg();
break; break;
case 'q': case 'q':
Options |= EOptionDumpReflection; Options |= EOptionDumpReflection;
@ -1122,12 +1117,11 @@ void usage()
" without explicit bindings.\n" " without explicit bindings.\n"
" --amb synonym for --auto-map-bindings\n" " --amb synonym for --auto-map-bindings\n"
" --auto-map-locations automatically locate input/output lacking\n" " --auto-map-locations automatically locate input/output lacking\n"
" 'location'\n (fragile, not cross stage)\n" " 'location' (fragile, not cross stage)\n"
" --aml synonym for --auto-map-locations\n" " --aml synonym for --auto-map-locations\n"
" --flatten-uniform-arrays flatten uniform texture/sampler arrays to\n" " --flatten-uniform-arrays flatten uniform texture/sampler arrays to\n"
" scalars\n" " scalars\n"
" --fua synonym for --flatten-uniform-arrays\n" " --fua synonym for --flatten-uniform-arrays\n"
"\n"
" --hlsl-offsets Allow block offsets to follow HLSL rules\n" " --hlsl-offsets Allow block offsets to follow HLSL rules\n"
" Works independently of source language\n" " Works independently of source language\n"
" --hlsl-iomap Perform IO mapping in HLSL register space\n" " --hlsl-iomap Perform IO mapping in HLSL register space\n"