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

HLSL: return correct error when HLSL parsing fails.

Browse Source 
At least partially addresses issue #510.
This commit is contained in:
John Kessenich 2016-09-15 22:49:31 -06:00
parent 315b6b9f68
commit 7f702124ec
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 "Overload400-PrecQual.1482" #define GLSLANG_REVISION "Overload400-PrecQual.1485"
#define GLSLANG_DATE "12-Sep-2016" #define GLSLANG_DATE "15-Sep-2016"

5
hlsl/hlslParseHelper.cpp
View File

@ -119,14 +119,15 @@ bool HlslParseContext::parseShaderStrings(TPpContext& ppContext, TInputScanner&
HlslScanContext scanContext(*this, ppContext); HlslScanContext scanContext(*this, ppContext);
HlslGrammar grammar(scanContext, *this); HlslGrammar grammar(scanContext, *this);
if (!grammar.parse()) if (!grammar.parse()) {
{
// Print a message formated such that if you click on the message it will take you right to // Print a message formated such that if you click on the message it will take you right to
// the line through most UIs. // 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, printf("\n%s(%i): error at column %i, HLSL translation failed.\n", sourceLoc.name, sourceLoc.line,
sourceLoc.column); sourceLoc.column);
return false;
} }
return numErrors == 0; return numErrors == 0;
} }