diff options
author | Chad Versace <chad.versace@linux.intel.com> | 2012-11-30 14:31:21 -0800 |
---|---|---|
committer | Chad Versace <chad.versace@linux.intel.com> | 2012-11-30 18:45:50 -0800 |
commit | 5b8c60ced65a950f9f5fa6a65c3d61b4474575c2 (patch) | |
tree | b448953af48cadb71fc4887f0e449fe061123928 /tests/spec/arb_texture_cube_map_array | |
parent | 598fc3e4aa3306cf00ede01236b4bad7d294c6eb (diff) |
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 <chad.versace@linux.intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Diffstat (limited to 'tests/spec/arb_texture_cube_map_array')
-rw-r--r-- | tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c b/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c index 35818cea7..7c80ef637 100644 --- a/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c +++ b/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c @@ -100,7 +100,7 @@ shaderSetup(void) vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vertShaderText); fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fragShaderText); prog = piglit_link_simple_program(vs, fs); - piglit_UseProgram(prog); + glUseProgram(prog); } @@ -185,7 +185,7 @@ piglit_display(void) GLfloat black[4] = {0.0, 0.0, 0.0, 1.0}; loc1 = glGetUniformLocation(prog, "cubeArrayShadow"); - loc2 = piglit_GetAttribLocation(prog, "compf"); + loc2 = glGetAttribLocation(prog, "compf"); glClear(GL_COLOR_BUFFER_BIT); glMatrixMode(GL_MODELVIEW); |