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

HLSL: Fix #834: Report #version is an illegal command.

Browse Source
This commit is contained in:
John Kessenich 2017-04-12 17:24:34 -06:00
parent a0c578a6df
commit a4c64c988c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glslang/MachineIndependent/preprocessor/Pp.cpp
View File

@ -776,8 +776,12 @@ int TPpContext::CPPversion(TPpToken* ppToken)
{ {
int token = scanToken(ppToken); int token = scanToken(ppToken);
if (errorOnVersion || versionSeen) if (errorOnVersion || versionSeen) {
if (parseContext.isReadingHLSL())
parseContext.ppError(ppToken->loc, "invalid preprocessor command", "#version", "");
else
parseContext.ppError(ppToken->loc, "must occur first in shader", "#version", ""); parseContext.ppError(ppToken->loc, "must occur first in shader", "#version", "");
}
versionSeen = true; versionSeen = true;
if (token == '\n') { if (token == '\n') {