summaryrefslogtreecommitdiff
path: root/tests/spec/arb_uniform_buffer_object
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2012-12-14 11:15:18 -0800
committerIan Romanick <ian.d.romanick@intel.com>2012-12-17 10:05:16 -0800
commit183bbf1f4c6ad31aaa6e8fa3570a822250ecc361 (patch)
tree273cbbb75fb8dca11e5a24ef412dcbfc4b6c13d1 /tests/spec/arb_uniform_buffer_object
parent224db81075851c5f569869ca04b754aab1ca91c0 (diff)
arb_uniform_buffer: Fix block / field names in dlist test
Both the block name and the names of the individual variables in the block live at global scope. Therefore, they can't both have the same names. The GLSL 1.40 spec says: "Uniform block names and variable names declared within uniform blocks are scoped at the program level." Previously this test failed on NVIDIA's closed-source driver (version 304.64) with the error messages: 0(2) : error C1002: the name "a" is already defined at 0(2) 0(3) : error C1002: the name "b" is already defined at 0(3) With this change, the test passes. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'tests/spec/arb_uniform_buffer_object')
-rw-r--r--tests/spec/arb_uniform_buffer_object/dlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/spec/arb_uniform_buffer_object/dlist.c b/tests/spec/arb_uniform_buffer_object/dlist.c
index 0b440ca47..1d101a9ce 100644
--- a/tests/spec/arb_uniform_buffer_object/dlist.c
+++ b/tests/spec/arb_uniform_buffer_object/dlist.c
@@ -66,8 +66,8 @@ PIGLIT_GL_TEST_CONFIG_END
const char *source =
"#extension GL_ARB_uniform_buffer_object : enable\n"
- "uniform a { float a; };\n"
- "uniform b { float b; };\n"
+ "uniform A { float a; };\n"
+ "uniform B { float b; };\n"
"void main() {\n"
" gl_FragColor = vec4(a);\n"
"}\n";