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

Issue error when declaration rule fails

Browse Source 
Fix #2514.
This commit is contained in:
Jeremy Hayes 2021-04-09 16:37:20 -06:00
parent 9f76fd1330
commit 4b900778c3
2 changed files with 5 additions and 2 deletions
Show Stats 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: ./inc2/../foo.h:1: '#error' : should not be included
ERROR: ./parentBad:3: '#error' : bad parent ERROR: ./parentBad:3: '#error' : bad parent
ERROR: hlsl.includeNegative.vert:7: '#error' : in main 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. 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 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; return true;
// declaration // declaration
if (! acceptDeclaration(nodeList)) if (! acceptDeclaration(nodeList)) {
expected("declaration");
return false; return false;
}
} while (true); } while (true);
return true; return true;