Merge pull request #2602 from jeremy-lunarg/hayes-2514

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

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;