Previously, we were passing these through, just like any other pragma. But the
downstream compiler was tripping up on them. It seems easier to swallow these
in the preprocessor and not pass them on at all rather than fixing the
downstream compiler.
This fixes the following Khronos GLES3 CTS tests:
preprocessor.pragmas.pragma_vertex
preprocessor.pragmas.pragma_fragment
---
src/glsl/glcpp/glcpp-lex.l | 6 ++++++
src/glsl/glcpp/tests/127-pragma-empty.c.expected | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index 2398433..bcc1337 100644
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -288,6 +288,12 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
RETURN_STRING_TOKEN (VERSION_TOKEN);
}
+ /* Swallow empty #pragma directives, (to avoid confusing the
+ * downstream compiler). */
+<HASH>pragma{HSPACE}*/{NEWLINE} {
+ BEGIN INITIAL;
+}
+
/* glcpp doesn't handle #extension, #version, or #pragma directives.
* Simply pass them through to the main compiler's lexer/parser. */
<HASH>(extension|pragma)[^\r\n]* {
diff --git a/src/glsl/glcpp/tests/127-pragma-empty.c.expected
b/src/glsl/glcpp/tests/127-pragma-empty.c.expected
index 89fe08e..92371a0 100644
--- a/src/glsl/glcpp/tests/127-pragma-empty.c.expected
+++ b/src/glsl/glcpp/tests/127-pragma-empty.c.expected
@@ -1,3 +1,3 @@
-#pragma
+
--
2.0.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
