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

Changing target to stage

Browse Source
This commit is contained in:
Dan Baker 2016-08-11 14:06:06 -04:00
parent 45d49bcd51
commit c6ede8938a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
StandAlone/StandAlone.cpp
View File

@ -155,7 +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* shaderTargetName = 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.
@ -238,7 +238,7 @@ void ProcessArguments(int argc, char* argv[])
Options |= EOptionLinkProgram; Options |= EOptionLinkProgram;
break; break;
case 'T': case 'T':
shaderTargetName = argv[1]; shaderStageName = argv[1];
if (argc > 0) { if (argc > 0) {
argc--; argc--;
argv++; argv++;
@ -696,8 +696,8 @@ 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 (shaderTargetName) if (shaderStageName)
suffix = shaderTargetName; suffix = shaderStageName;
if (suffix == "vert") if (suffix == "vert")
return EShLangVertex; return EShLangVertex;
@ -792,7 +792,7 @@ 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"
" -T <target> uses explicit target specified, rather then the file extension.\n" " -S <stage> uses explicit stage specified, rather then the file extension.\n"
" valid choices are vert,tesc, tese,geom, rag,comp\n" " valid choices are vert,tesc, tese,geom, rag,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"