summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2016-08-14 21:00:31 -0700
committerKenneth Graunke <[email protected]>2016-08-15 22:55:34 -0700
commit1f47f78fc3193ecff13799305a8e35af82e68a06 (patch)
tree2a9d5ccedff0982b4a15a1b4cf1084f3bb758180 /src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
parentc2f225203721681fe964cb6f1f4fec317260a91e (diff)
glcpp: Update tests for new #undef of built-in macro rules.
Ian recently changed the preprocessor to allow this in most GLSL versions, but not GLSL ES 3.00+. This patch converts the existing test that expects a failure to a #version 300 es shader, and adds a #version 110 shader to make sure that it's allowed. Fixes 'make check'. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97307 Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Tested-by: Vinson Lee <[email protected]>
Diffstat (limited to 'src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected')
-rw-r--r--src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
index 3b736df378e..498dc0f98d1 100644
--- a/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
+++ b/src/compiler/glsl/glcpp/tests/120-undef-builtin.c.expected
@@ -1,6 +1,7 @@
-0:1(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined.
0:2(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined.
0:3(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined.
+0:4(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined.
+#version 300 es