From 5b8c60ced65a950f9f5fa6a65c3d61b4474575c2 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Fri, 30 Nov 2012 14:31:21 -0800 Subject: util/gl: Kill shader wrapper functions This patch kills the wrapper functions defined in piglit-shader.h for GL. They are rendered obsolete by piglit-dispatch. A subset of the wrappers are kept for GLES1 and GLES2. - All GLES1 wrappers are kept and are renamed to match the core GL names. That is, piglit_$func is renamed to gl$func. As before, the wrappers simply raise an assertion failure because GLES1 does not suppport shaders. - The subset of GLES2 wrappers that raise an assertion, because the function is not supported on GLES2, are also kept and likewise renamed. Signed-off-by: Chad Versace Reviewed-by: Anuj Phogat --- tests/spec/arb_shader_texture_lod/execution/texgrad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/spec/arb_shader_texture_lod') diff --git a/tests/spec/arb_shader_texture_lod/execution/texgrad.c b/tests/spec/arb_shader_texture_lod/execution/texgrad.c index e502ecd54..bafefe42a 100644 --- a/tests/spec/arb_shader_texture_lod/execution/texgrad.c +++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c @@ -175,11 +175,11 @@ enum piglit_result piglit_display(void) glClear(GL_COLOR_BUFFER_BIT); glViewport(0, 0, piglit_width/2, piglit_height); - piglit_UseProgram(prog_tex); + glUseProgram(prog_tex); draw_quad(); glViewport(piglit_width/2, 0, piglit_width/2, piglit_height); - piglit_UseProgram(prog_texgrad); + glUseProgram(prog_texgrad); draw_quad(); if (!piglit_probe_rect_halves_equal_rgba(0, 0, piglit_width, piglit_height)) -- cgit v1.2.3