summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-05-07 12:51:34 -0700
committerEric Anholt <eric@anholt.net>2013-05-14 10:54:42 -0700
commit2d693902c27eed39efc03ea20d0bf8c29a7776ce (patch)
tree10fca46b8b70ab089b408980b70381cfe707cde9
parent25b440c9689e7fc55c993dff407832afccd159e8 (diff)
varying-struct-centroid: Convert to new piglit_build_simple_program().
I'm not intentionally singling this test out (which would have tried to continue if a shader stage failed to compile), it's just the first thing I looked at when I was going to crib code for a new GLES test, and decided to go work on new util functions instead. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--tests/spec/glsl-es-3.00/execution/varying-struct-centroid.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/spec/glsl-es-3.00/execution/varying-struct-centroid.c b/tests/spec/glsl-es-3.00/execution/varying-struct-centroid.c
index d1692a759..e8734b925 100644
--- a/tests/spec/glsl-es-3.00/execution/varying-struct-centroid.c
+++ b/tests/spec/glsl-es-3.00/execution/varying-struct-centroid.c
@@ -78,7 +78,7 @@ PIGLIT_GL_TEST_CONFIG_END
static const char vs_text[] =
"#version 300 es\n"
- "in vec4 vertex;\n"
+ "in vec4 piglit_vertex;\n"
"struct Foo {\n"
" vec4 v;\n"
"};\n"
@@ -125,15 +125,7 @@ void
piglit_init(int argc, char **argv)
{
/* Create the shaders */
- prog = glCreateProgram();
- glAttachShader(prog, piglit_compile_shader_text(GL_VERTEX_SHADER,
- vs_text));
- glAttachShader(prog, piglit_compile_shader_text(GL_FRAGMENT_SHADER,
- fs_text));
- glBindAttribLocation(prog, PIGLIT_ATTRIB_POS, "vertex");
- glLinkProgram(prog);
- if (!piglit_link_check_status(prog))
- piglit_report_result(PIGLIT_FAIL);
+ prog = piglit_build_simple_program(vs_text, fs_text);
/* Create the multisampled framebuffer */
glGenFramebuffers(1, &fbo);