BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Issue error when declaration rule fails
This commit is contained in:
Greg Fischer 2021-04-14 16:24:38 -06:00 • committed by GitHub
commit b3859343a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Test/baseResults/hlsl.includeNegative.vert.out
View file

@ -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

4
glslang/HLSL/hlslGrammar.cpp
View file

@ -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;