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

a4c64c98 · John Kessenich · a0c578a6 · a4c64c98
Commit a4c64c98 authored Apr 12, 2017 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Pp.cpp glslang/MachineIndependent/preprocessor/Pp.cpp +6 -2

No files found.
--- a/glslang/MachineIndependent/preprocessor/Pp.cpp
+++ b/glslang/MachineIndependent/preprocessor/Pp.cpp
@@ -776,8 +776,12 @@ int TPpContext::CPPversion(TPpToken* ppToken)
 {
    int token = scanToken(ppToken);

-    if (errorOnVersion || versionSeen)
-        parseContext.ppError(ppToken->loc, "must occur first in shader", "#version", "");
+    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", "");
+    }
    versionSeen = true;

    if (token == '\n') {