Make FindLanguage use the entire name if parseStageName is false

This commit is contained in:
Grigory Dzhavadyan 2018-04-12 20:31:27 -07:00
parent ef203bfa38
commit 33ddaaafc1

View File

@ -1202,7 +1202,6 @@ int C_DECL main(int argc, char* argv[])
EShLanguage FindLanguage(const std::string& name, bool parseStageName) EShLanguage FindLanguage(const std::string& name, bool parseStageName)
{ {
std::string stage_name; std::string stage_name;
if (shaderStageName) { if (shaderStageName) {
stage_name = shaderStageName; stage_name = shaderStageName;
} else if (parseStageName) { } else if (parseStageName) {
@ -1225,6 +1224,8 @@ EShLanguage FindLanguage(const std::string& name, bool parseStageName)
usage(); usage();
return EShLangVertex; return EShLangVertex;
} }
} else {
stage_name = name;
} }
if (stage_name == "vert") if (stage_name == "vert")
return EShLangVertex; return EShLangVertex;