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

Merge pull request #450 from dankbaker/standalone_change

Browse Source 
Allowing explicit specification of shader compiltion type via -T opti…
This commit is contained in:
John Kessenich 2016-08-11 16:37:52 -06:00 committed by GitHub
commit 28660bb580
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
StandAlone/StandAlone.cpp
View File

@ -155,6 +155,7 @@ int Options = 0;
const char* ExecutableName = nullptr; const char* ExecutableName = nullptr;
const char* binaryFileName = nullptr; const char* binaryFileName = nullptr;
const char* entryPointName = nullptr; const char* entryPointName = nullptr;
const char* shaderStageName = nullptr;
// //
// Create the default name for saving a binary if -o is not provided. // Create the default name for saving a binary if -o is not provided.
@ -236,6 +237,15 @@ void ProcessArguments(int argc, char* argv[])
Options |= EOptionVulkanRules; Options |= EOptionVulkanRules;
Options |= EOptionLinkProgram; Options |= EOptionLinkProgram;
break; break;
case 'S':
shaderStageName = argv[1];
if (argc > 0) {
argc--;
argv++;
}
else
Error("no <stage> specified for -S");
break;
case 'G': case 'G':
Options |= EOptionSpv; Options |= EOptionSpv;
Options |= EOptionLinkProgram; Options |= EOptionLinkProgram;
@ -685,6 +695,9 @@ EShLanguage FindLanguage(const std::string& name)
} }
std::string suffix = name.substr(ext + 1, std::string::npos); std::string suffix = name.substr(ext + 1, std::string::npos);
if (shaderStageName)
suffix = shaderStageName;
if (suffix == "vert") if (suffix == "vert")
return EShLangVertex; return EShLangVertex;
else if (suffix == "tesc") else if (suffix == "tesc")
@ -778,6 +791,8 @@ void usage()
" -H print human readable form of SPIR-V; turns on -V\n" " -H print human readable form of SPIR-V; turns on -V\n"
" -E print pre-processed GLSL; cannot be used with -l;\n" " -E print pre-processed GLSL; cannot be used with -l;\n"
" errors will appear on stderr.\n" " errors will appear on stderr.\n"
" -S <stage> uses explicit stage specified, rather then the file extension.\n"
" valid choices are vert, tesc, tese, geom, frag, or comp\n"
" -c configuration dump;\n" " -c configuration dump;\n"
" creates the default configuration file (redirect to a .conf file)\n" " creates the default configuration file (redirect to a .conf file)\n"
" -C cascading errors; risks crashes from accumulation of error recoveries\n" " -C cascading errors; risks crashes from accumulation of error recoveries\n"