From 7f702124ece009c5882ae29eb23169901edb5663 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Thu, 15 Sep 2016 22:49:31 -0600 Subject: [PATCH] HLSL: return correct error when HLSL parsing fails. At least partially addresses issue #510. --- glslang/Include/revision.h | 4 ++-- hlsl/hlslParseHelper.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 74310f35..e45c88a4 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 "Overload400-PrecQual.1482" -#define GLSLANG_DATE "12-Sep-2016" +#define GLSLANG_REVISION "Overload400-PrecQual.1485" +#define GLSLANG_DATE "15-Sep-2016" diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 40bea67f..bd2ff629 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -119,14 +119,15 @@ bool HlslParseContext::parseShaderStrings(TPpContext& ppContext, TInputScanner& HlslScanContext scanContext(*this, ppContext); 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 // 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); + return false; } + return numErrors == 0; }