diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-06-17 01:43:37 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-06-18 17:41:49 -0400 |
| commit | 9837ee19691da55dfb31086283bb6831d888f96b (patch) | |
| tree | 9948c93719d047b250e08bbeac3dfacf0bfdef27 | |
| parent | 94dfd5352e7c68e4b080e63ea824f2dc313e5389 (diff) | |
arb_shader_atomic_counters: recursion checks require a second paste macro
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
| -rw-r--r-- | tests/spec/arb_shader_atomic_counters/max-counters.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/spec/arb_shader_atomic_counters/max-counters.c b/tests/spec/arb_shader_atomic_counters/max-counters.c index 409247d8d..6207d2246 100644 --- a/tests/spec/arb_shader_atomic_counters/max-counters.c +++ b/tests/spec/arb_shader_atomic_counters/max-counters.c @@ -158,7 +158,8 @@ run_test_fragment_max_buffers(unsigned num_buffers) char *src = atomic_counters_generate_source( "#version 140\n" "#extension GL_ARB_shader_atomic_counters : enable\n" - "#define Y(I) y##I\n" + "#define PASTE(A,B) A ## B\n" + "#define Y(I) PASTE(y, I)\n" "\n" "out ivec4 fcolor;\n" "\n" @@ -190,7 +191,8 @@ run_test_vertex_max_buffers(unsigned num_buffers) char *src = atomic_counters_generate_source( "#version 140\n" "#extension GL_ARB_shader_atomic_counters : enable\n" - "#define X(I) x##I\n" + "#define PASTE(A,B) A ## B\n" + "#define X(I) PASTE(x, I)\n" "\n" "in vec4 position;\n" "flat out ivec4 vcolor;\n" @@ -225,7 +227,8 @@ run_test_combined_max_buffers(unsigned num_fragment_buffers, char *fs_source = atomic_counters_generate_source( "#version 140\n" "#extension GL_ARB_shader_atomic_counters : enable\n" - "#define Y(I) y##I\n" + "#define PASTE(A,B) A ## B\n" + "#define Y(I) PASTE(y, I)\n" "\n" "out ivec4 fcolor;\n" "\n" @@ -245,7 +248,8 @@ run_test_combined_max_buffers(unsigned num_fragment_buffers, char *vs_source = atomic_counters_generate_source( "#version 140\n" "#extension GL_ARB_shader_atomic_counters : enable\n" - "#define X(I) x##I\n" + "#define PASTE(A,B) A ## B\n" + "#define X(I) PASTE(x, I)\n" "\n" "in vec4 position;\n" "flat out ivec4 vcolor;\n" |