diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp index 0c54273e03..606f24765f 100644 --- a/StandAlone/StandAlone.cpp +++ b/StandAlone/StandAlone.cpp @@ -415,13 +415,13 @@ struct ShaderCompUnit { char** text; // memory owned/managed externally 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) { stage = istage; fileName = ifileName; text = itext; - fileNameList[0] = fileName.c_str(); + fileNameList[0] = fileName.c_str(); } ShaderCompUnit(const ShaderCompUnit &rhs) @@ -429,7 +429,7 @@ struct ShaderCompUnit { stage = rhs.stage; fileName = rhs.fileName; text = rhs.text; - fileNameList[0] = fileName.c_str(); + fileNameList[0] = fileName.c_str(); } }; diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 5bc8c9ded7..3a929fd930 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // 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). -#define GLSLANG_REVISION "SPIRV99.1401" -#define GLSLANG_DATE "11-Aug-2016" +#define GLSLANG_REVISION "SPIRV99.1426" +#define GLSLANG_DATE "23-Aug-2016" diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 3aef7bb1d3..42d6704c96 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -118,9 +118,11 @@ bool HlslParseContext::parseShaderStrings(TPpContext& ppContext, TInputScanner& HlslGrammar grammar(scanContext, *this); 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(); - 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; }