fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "Revert "glsl: skip stringification in preprocessor if in unreachable branch""

Browse source 
This reverts commit 2fd6f06faa.

Take back 28a3731e3f ("glsl: skip stringification in preprocessor if in
unreachable branch") after b9fe8ff23d ("glsl: fixer lexer for
unreachable defines") has made it to the branch.

Signed-off-by: Andres Gomez <agomez@igalia.com>
This commit is contained in:
Andres Gomez 2018-09-08 01:03:13 +03:00
parent 8a471fe120
commit 4c977744ba
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/compiler/glsl/glcpp/glcpp-lex.l
View file

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