Commit 219b025d by John Kessenich

Non-functional: Fix commit 98f164ec.

Fix previous commit to not use tabs and otherwise match local coding conventions better.
parent 98f164ec
...@@ -415,7 +415,7 @@ struct ShaderCompUnit { ...@@ -415,7 +415,7 @@ struct ShaderCompUnit {
char** text; // memory owned/managed externally char** text; // memory owned/managed externally
const char* fileNameList[1]; const char* fileNameList[1];
//Need to have a special constructors to adjust the fileNameList, since back end needs a list of ptrs // Need to have a special constructors to adjust the fileNameList, since back end needs a list of ptrs
ShaderCompUnit(EShLanguage istage, std::string &ifileName, char** itext) ShaderCompUnit(EShLanguage istage, std::string &ifileName, char** itext)
{ {
stage = istage; stage = istage;
......
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "SPIRV99.1401" #define GLSLANG_REVISION "SPIRV99.1426"
#define GLSLANG_DATE "11-Aug-2016" #define GLSLANG_DATE "23-Aug-2016"
...@@ -118,9 +118,11 @@ bool HlslParseContext::parseShaderStrings(TPpContext& ppContext, TInputScanner& ...@@ -118,9 +118,11 @@ bool HlslParseContext::parseShaderStrings(TPpContext& ppContext, TInputScanner&
HlslGrammar grammar(scanContext, *this); HlslGrammar grammar(scanContext, *this);
if (!grammar.parse()) if (!grammar.parse())
{ {
//Print out a nicer error message that should be formated such that if you click on the message it will take you right to the line through most UIs // Print a message formated such that if you click on the message it will take you right to
// the line through most UIs.
const glslang::TSourceLoc& sourceLoc = input.getSourceLoc(); const glslang::TSourceLoc& sourceLoc = input.getSourceLoc();
printf("\n%s(%i): error at column %i, HLSL translation failed.\n", sourceLoc.name, sourceLoc.line, sourceLoc.column); printf("\n%s(%i): error at column %i, HLSL translation failed.\n", sourceLoc.name, sourceLoc.line,
sourceLoc.column);
} }
return numErrors == 0; return numErrors == 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment