summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2011-09-29 17:04:09 -0700
committerCarl Worth <[email protected]>2011-09-30 11:44:04 -0700
commit7bb3403e0172a440b8100bcf1db8462f50a254cc (patch)
tree167b53225f97626b937e0cb5981f2b94df8df3bb /src/glsl
parent3c01a589448b92945f26bd7e3bfa75155c06f3cf (diff)
glcpp: Test a non-function-like macro using the token paste operator
Apparently we never implemented this, (but we've got a GLSL 1.30 test in piglit that is exercising this case). Reviewed-by: Kenneth Graunke <[email protected]> Signed-off-by: Carl Worth <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/glcpp/tests/097-paste-with-non-function-macro.c3
-rw-r--r--src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected4
2 files changed, 7 insertions, 0 deletions
diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c
new file mode 100644
index 00000000000..0f46835c29e
--- /dev/null
+++ b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c
@@ -0,0 +1,3 @@
+#define PASTE_MACRO one ## token
+PASTE_MACRO
+
diff --git a/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
new file mode 100644
index 00000000000..af92187ee90
--- /dev/null
+++ b/src/glsl/glcpp/tests/097-paste-with-non-function-macro.c.expected
@@ -0,0 +1,4 @@
+
+onetoken
+
+