diff --git a/Test/baseResults/hlsl.includeNegative.vert.out b/Test/baseResults/hlsl.includeNegative.vert.out index 5faa383f..67bf41c7 100644 --- a/Test/baseResults/hlsl.includeNegative.vert.out +++ b/Test/baseResults/hlsl.includeNegative.vert.out @@ -3,8 +3,9 @@ ERROR: ./foo.h:1: '#error' : should not be included ERROR: ./inc2/../foo.h:1: '#error' : should not be included ERROR: ./parentBad:3: '#error' : bad parent ERROR: hlsl.includeNegative.vert:7: '#error' : in main +ERROR: hlsl.includeNegative.vert:6: 'declaration' : Expected hlsl.includeNegative.vert(8): error at column 0, HLSL parsing failed. -ERROR: 5 compilation errors. No code generated. +ERROR: 6 compilation errors. No code generated. SPIR-V is not generated for failed compile or link diff --git a/glslang/HLSL/hlslGrammar.cpp b/glslang/HLSL/hlslGrammar.cpp index f30c6409..df1625e0 100644 --- a/glslang/HLSL/hlslGrammar.cpp +++ b/glslang/HLSL/hlslGrammar.cpp @@ -161,8 +161,10 @@ bool HlslGrammar::acceptDeclarationList(TIntermNode*& nodeList) return true; // declaration - if (! acceptDeclaration(nodeList)) + if (! acceptDeclaration(nodeList)) { + expected("declaration"); return false; + } } while (true); return true;