OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: skip stringification in preprocessor if in unreachable branch

Browse Source 
This fixes compilation of some "No Mans Sky" shaders where the stringification
happens in branches intended for DX12.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Timothy Arceri
2018-08-29 11:36:51 +10:00
parent 4738b6ac81
commit 28a3731e3f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/glcpp/glcpp-lex.l
View File

@@ -420,8 +420,10 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
/* This will catch any non-directive garbage after a HASH */ /* This will catch any non-directive garbage after a HASH */
<HASH>{NONSPACE} { <HASH>{NONSPACE} {
if (!parser->skipping) {
BEGIN INITIAL; BEGIN INITIAL;
RETURN_TOKEN (GARBAGE); RETURN_TOKEN (GARBAGE);
}
} }
/* An identifier immediately followed by '(' */ /* An identifier immediately followed by '(' */