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

Infrastructure: If using .hlsl suffix, default is -D.

Browse Source
This commit is contained in:
John Kessenich 2018-04-17 21:02:19 -06:00
parent 4c57470872
commit 3beac945ff
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
StandAlone/StandAlone.cpp
View File

@ -1214,11 +1214,13 @@ EShLanguage FindLanguage(const std::string& name, bool parseStageName)
bool hasSecondExt = secondExtStart != std::string::npos; bool hasSecondExt = secondExtStart != std::string::npos;
std::string firstExt = name.substr(firstExtStart + 1, std::string::npos); std::string firstExt = name.substr(firstExtStart + 1, std::string::npos);
bool usesUnifiedExt = hasFirstExt && (firstExt == "glsl" || firstExt == "hlsl"); bool usesUnifiedExt = hasFirstExt && (firstExt == "glsl" || firstExt == "hlsl");
if (hasFirstExt && !usesUnifiedExt) { if (usesUnifiedExt && firstExt == "hlsl")
Options |= EOptionReadHlsl;
if (hasFirstExt && !usesUnifiedExt)
stageName = firstExt; stageName = firstExt;
} else if (usesUnifiedExt && hasSecondExt) { else if (usesUnifiedExt && hasSecondExt)
stageName = name.substr(secondExtStart + 1, firstExtStart - secondExtStart - 1); stageName = name.substr(secondExtStart + 1, firstExtStart - secondExtStart - 1);
} else { else {
usage(); usage();
return EShLangVertex; return EShLangVertex;
} }
@ -1311,7 +1313,7 @@ void usage()
"\n" "\n"
"Options:\n" "Options:\n"
" -C cascading errors; risk crash from accumulation of error recoveries\n" " -C cascading errors; risk crash from accumulation of error recoveries\n"
" -D input is HLSL\n" " -D input is HLSL (default when any suffix is .hlsl)\n"
" -D<macro=def>\n" " -D<macro=def>\n"
" -D<macro> define a pre-processor macro\n" " -D<macro> define a pre-processor macro\n"
" -E print pre-processed GLSL; cannot be used with -l;\n" " -E print pre-processed GLSL; cannot be used with -l;\n"

2
Test/runtests
View File

@ -81,7 +81,7 @@ $EXE -i -S vert nosuffix > $TARGETDIR/nosuffix.out
diff -b $BASEDIR/nosuffix.out $TARGETDIR/nosuffix.out || HASERROR=1 diff -b $BASEDIR/nosuffix.out $TARGETDIR/nosuffix.out || HASERROR=1
$EXE -i compoundsuffix.vert.glsl > $TARGETDIR/compoundsuffix.vert.glsl $EXE -i compoundsuffix.vert.glsl > $TARGETDIR/compoundsuffix.vert.glsl
diff -b $BASEDIR/compoundsuffix.vert.glsl $TARGETDIR/compoundsuffix.vert.glsl || HASERROR=1 diff -b $BASEDIR/compoundsuffix.vert.glsl $TARGETDIR/compoundsuffix.vert.glsl || HASERROR=1
$EXE -D -e main -H compoundsuffix.frag.hlsl > $TARGETDIR/compoundsuffix.frag.hlsl $EXE -e main -H compoundsuffix.frag.hlsl > $TARGETDIR/compoundsuffix.frag.hlsl
diff -b $BASEDIR/compoundsuffix.frag.hlsl $TARGETDIR/compoundsuffix.frag.hlsl || HASERROR=1 diff -b $BASEDIR/compoundsuffix.frag.hlsl $TARGETDIR/compoundsuffix.frag.hlsl || HASERROR=1
# #