| 1 |
From 4c977744ba3f99cd0c71773c684a3247af4ba98a Mon Sep 17 00:00:00 2001 |
| 2 |
From: Andres Gomez <agomez@igalia.com> |
| 3 |
Date: Sat, 8 Sep 2018 01:03:13 +0300 |
| 4 |
Subject: [PATCH 11/20] Revert "Revert "glsl: skip stringification in |
| 5 |
preprocessor if in unreachable branch"" |
| 6 |
|
| 7 |
This reverts commit 2fd6f06faabb5b16d529e035ae4523a8566bf9bc. |
| 8 |
|
| 9 |
Take back 28a3731e3f4 ("glsl: skip stringification in preprocessor if in |
| 10 |
unreachable branch") after b9fe8ff23dc ("glsl: fixer lexer for |
| 11 |
unreachable defines") has made it to the branch. |
| 12 |
|
| 13 |
Signed-off-by: Andres Gomez <agomez@igalia.com> |
| 14 |
--- |
| 15 |
src/compiler/glsl/glcpp/glcpp-lex.l | 6 ++++-- |
| 16 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/src/compiler/glsl/glcpp/glcpp-lex.l b/src/compiler/glsl/glcpp/glcpp-lex.l |
| 19 |
index 05447b31e4..f7003da0cc 100644 |
| 20 |
--- a/src/compiler/glsl/glcpp/glcpp-lex.l |
| 21 |
+++ b/src/compiler/glsl/glcpp/glcpp-lex.l |
| 22 |
@@ -434,8 +434,10 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? |
| 23 |
|
| 24 |
/* This will catch any non-directive garbage after a HASH */ |
| 25 |
<HASH>{NONSPACE} { |
| 26 |
- BEGIN INITIAL; |
| 27 |
- RETURN_TOKEN (GARBAGE); |
| 28 |
+ if (!parser->skipping) { |
| 29 |
+ BEGIN INITIAL; |
| 30 |
+ RETURN_TOKEN (GARBAGE); |
| 31 |
+ } |
| 32 |
} |
| 33 |
|
| 34 |
/* An identifier immediately followed by '(' */ |
| 35 |
-- |
| 36 |
2.18.0 |
| 37 |
|
Parent Directory
| 
Revision Log