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

Non-functional: Fix commit 98f164ec488f85af5a44b701477a34e810f2deb1.

Browse Source 
Fix previous commit to not use tabs and otherwise match local coding
conventions better.
This commit is contained in:
John Kessenich 2016-08-23 17:51:13 -06:00
parent 98f164ec48
commit 219b025d7e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
StandAlone/StandAlone.cpp
View File

@ -415,13 +415,13 @@ 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;
fileName = ifileName; fileName = ifileName;
text = itext; text = itext;
fileNameList[0] = fileName.c_str(); fileNameList[0] = fileName.c_str();
} }
ShaderCompUnit(const ShaderCompUnit &rhs) ShaderCompUnit(const ShaderCompUnit &rhs)
@ -429,7 +429,7 @@ struct ShaderCompUnit {
stage = rhs.stage; stage = rhs.stage;
fileName = rhs.fileName; fileName = rhs.fileName;
text = rhs.text; text = rhs.text;
fileNameList[0] = fileName.c_str(); fileNameList[0] = fileName.c_str();
} }
}; };

4
glslang/Include/revision.h
View File

@ -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"

6
hlsl/hlslParseHelper.cpp
View File

@ -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;
} }