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

HLSL: Add EHTokStringConstant, so that string attributes may be parsed

Browse Source
This commit is contained in:
steve-lunarg
2016-08-22 16:13:47 -06:00
parent b9e39120b4
commit efe9724795
6 changed files with 123 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glslang/MachineIndependent/preprocessor/PpScanner.cpp
View File

@@ -747,7 +747,12 @@ const char* TPpContext::tokenize(TPpToken* ppToken)
tokenString = ppToken->name;
break;
case PpAtomConstString:
parseContext.ppError(ppToken->loc, "string literals not supported", "\"\"", "");
if (parseContext.intermediate.getSource() == EShSourceHlsl) {
// HLSL allows string literals.
tokenString = ppToken->name;
} else {
parseContext.ppError(ppToken->loc, "string literals not supported", "\"\"", "");
}
break;
case '\'':
parseContext.ppError(ppToken->loc, "character literals not supported", "\'", "");