diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
commit | 59d54334c96f44ed1d8bf660dc96221362a77d04 (patch) | |
tree | e9ab34e568256bcdc2a88602c47072ab769211e8 /progs/tests/shader_api.c | |
parent | 7c8836e9ef49d938aa55a1c385b95c6371c301f1 (diff) | |
parent | c5c383596ddb26cd75e4b355918ad16915283b59 (diff) |
Merge branch 'master' into gallium-texture-transfer
Conflicts:
src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'progs/tests/shader_api.c')
-rw-r--r-- | progs/tests/shader_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/progs/tests/shader_api.c b/progs/tests/shader_api.c index 598f029a97..679f9137c8 100644 --- a/progs/tests/shader_api.c +++ b/progs/tests/shader_api.c @@ -113,7 +113,8 @@ static void test_uniform_size_type1(const char *glslType, GLenum glType, const c GLenum type; GLint size; - printf(" Running subtest %s\n", glslType); fflush(stdout); + printf(" Running subtest %s\n", glslType); + fflush(stdout); sprintf(buffer, "#version 120\nuniform %s m[60];\nvoid main() { gl_Position[0] = m[59]%s; }\n", glslType, el); @@ -169,7 +170,8 @@ static void test_attrib_size_type1(const char *glslType, GLenum glType, const ch GLenum type; GLint size; - printf(" Running subtest %s\n", glslType); fflush(stdout); + printf(" Running subtest %s\n", glslType); + fflush(stdout); sprintf(buffer, "#version 120\nattribute %s m;\nvoid main() { gl_Position[0] = m%s; }\n", glslType, el); @@ -302,8 +304,6 @@ static void test_uniform_multiple_samplers(void) assert_no_error(); program = make_program(NULL, "uniform sampler2D s[2];\nvoid main() { gl_FragColor = texture2D(s[1], vec2(0.0, 0.0)); }\n"); location = glGetUniformLocation(program, "s[0]"); - if (location == -1) /* Mesa doesn't currently support indexing */ - location = glGetUniformLocation(program, "s"); assert(location != -1); assert_no_error(); glUniform1iv(location, 2, values); |