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>

5 files changed, 28 insertions, 28 deletions

diff --git a/tests/texturing/incomplete-texture.c b/tests/texturing/incomplete-texture.c
index ce68b735..864aeb25 100644
--- a/tests/texturing/incomplete-texture.c
+++ b/tests/texturing/incomplete-texture.c
@@ -184,8 +184,8 @@ test_glsl(void)
 	draw_rect(2);
 
 	glUseProgram(0);
-	piglit_DeleteShader(frag);
-	piglit_DeleteProgram(prog);
+	glDeleteShader(frag);
+	glDeleteProgram(prog);
 
 	p = probe_pos(pos, expected);
 	if (!p)
diff --git a/tests/texturing/shaders/texelFetch.c b/tests/texturing/shaders/texelFetch.c
index 751863e7..4ee607ef 100644
--- a/tests/texturing/shaders/texelFetch.c
+++ b/tests/texturing/shaders/texelFetch.c
@@ -492,14 +492,14 @@ generate_GLSL(enum shader_target test_stage)
 		printf("FS code:\n%s", fs_code);
 		piglit_report_result(PIGLIT_FAIL);
 	}
-	prog = piglit_CreateProgram();
-	piglit_AttachShader(prog, vs);
-	piglit_AttachShader(prog, fs);
+	prog = glCreateProgram();
+	glAttachShader(prog, vs);
+	glAttachShader(prog, fs);
 
 	glBindAttribLocation(prog, pos_loc, "pos");
 	glBindAttribLocation(prog, texcoord_loc, "texcoord");
 
-	piglit_LinkProgram(prog);
+	glLinkProgram(prog);
 	if (!piglit_link_check_status(prog))
 		piglit_report_result(PIGLIT_FAIL);
 
@@ -596,12 +596,12 @@ piglit_init(int argc, char **argv)
 
 	prog = generate_GLSL(test_stage);
 
-	tex_location = piglit_GetUniformLocation(prog, "tex");
-	divisor_loc = piglit_GetUniformLocation(prog, "divisor");
+	tex_location = glGetUniformLocation(prog, "tex");
+	divisor_loc = glGetUniformLocation(prog, "divisor");
 
-	piglit_UseProgram(prog);
+	glUseProgram(prog);
 
-	piglit_Uniform1i(tex_location, 0);
+	glUniform1i(tex_location, 0);
 
 	/* Create textures and set miplevel info */
 	set_base_size();
diff --git a/tests/texturing/shaders/textureSize.c b/tests/texturing/shaders/textureSize.c
index 91684584..6adca7fe 100644
--- a/tests/texturing/shaders/textureSize.c
+++ b/tests/texturing/shaders/textureSize.c
@@ -137,7 +137,7 @@ piglit_display()
 		}
 		expected_color[3] = 1.0;
 
-		piglit_Uniform1i(lod_location, l);
+		glUniform1i(lod_location, l);
 		glViewport(x, 10, 10, 10);
 		glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
@@ -348,11 +348,11 @@ piglit_init(int argc, char **argv)
 	if (!prog)
 		piglit_report_result(PIGLIT_FAIL);
 
-	tex_location = piglit_GetUniformLocation(prog, "tex");
-	lod_location = piglit_GetUniformLocation(prog, "lod");
-	vertex_location = piglit_GetAttribLocation(prog, "vertex");
-	piglit_UseProgram(prog);
-	piglit_Uniform1i(tex_location, 0);
+	tex_location = glGetUniformLocation(prog, "tex");
+	lod_location = glGetUniformLocation(prog, "lod");
+	vertex_location = glGetAttribLocation(prog, "vertex");
+	glUseProgram(prog);
+	glUniform1i(tex_location, 0);
 
 	/* Create textures and set miplevel info */
 	set_base_size();
diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c
index 834c1381..f3b7f5bd 100644
--- a/tests/texturing/tex-miplevel-selection.c
+++ b/tests/texturing/tex-miplevel-selection.c
@@ -94,10 +94,10 @@ piglit_init(int argc, char **argv)
 
 		fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fscode);
 		prog = piglit_link_simple_program(0, fs);
-		piglit_UseProgram(prog);
-		loc_tex = piglit_GetUniformLocation(prog, "tex");
-		loc_lod = piglit_GetUniformLocation(prog, "lod");
-		piglit_Uniform1i(loc_tex, 0);
+		glUseProgram(prog);
+		loc_tex = glGetUniformLocation(prog, "tex");
+		loc_lod = glGetUniformLocation(prog, "lod");
+		glUniform1i(loc_tex, 0);
 
 		puts("Testing GL_ARB_shader_texture_lod.");
 	}
@@ -164,7 +164,7 @@ draw_quad(int x, int y, int w, int h, int level)
 
 	if (ARB_shader_texture_lod) {
 		float lod = level;
-		piglit_Uniform1fv(loc_lod, 1, &lod);
+		glUniform1fv(loc_lod, 1, &lod);
 
 		s = w/(float)TEX_WIDTH;
 		t = h/(float)TEX_HEIGHT;
diff --git a/tests/texturing/texwrap.c b/tests/texturing/texwrap.c
index ce0f7a2e..6d7dbb61 100644
--- a/tests/texturing/texwrap.c
+++ b/tests/texturing/texwrap.c
@@ -826,16 +826,16 @@ static void draw(const struct format_desc *format,
 	switch (format->type) {
 	case INT_TYPE:
 		scale[0] = scale[1] = scale[2] = scale[3] = 1.0/((1ull << (bits-1))-1);
-		piglit_UseProgram(prog_int);
-		piglit_Uniform4fv(int_scale_loc, 1, scale);
+		glUseProgram(prog_int);
+		glUniform4fv(int_scale_loc, 1, scale);
 		break;
 	case UINT_TYPE:
 		scale[0] = scale[1] = scale[2] = scale[3] = 1.0/((1ull << bits)-1);
 		if (bits == 10) {
 			scale[3] = 1.0/3;
 		}
-		piglit_UseProgram(prog_uint);
-		piglit_Uniform4fv(uint_scale_loc, 1, scale);
+		glUseProgram(prog_uint);
+		glUniform4fv(uint_scale_loc, 1, scale);
 		break;
 	default:;
 	}
@@ -936,7 +936,7 @@ static void draw(const struct format_desc *format,
 	switch (format->type) {
 	case INT_TYPE:
 	case UINT_TYPE:
-		piglit_UseProgram(0);
+		glUseProgram(0);
 		break;
 	default:;
 	}
@@ -1766,14 +1766,14 @@ outer_continue:;
 		assert(fp);
 		prog_int = piglit_link_simple_program(0, fp);
 		assert(prog_int);
-		int_scale_loc = piglit_GetUniformLocation(prog_int, "scale");
+		int_scale_loc = glGetUniformLocation(prog_int, "scale");
 		assert(int_scale_loc != -1);
 
 		fp = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fp_uint);
 		assert(fp);
 		prog_uint = piglit_link_simple_program(0, fp);
 		assert(prog_uint);
-		uint_scale_loc = piglit_GetUniformLocation(prog_uint, "scale");
+		uint_scale_loc = glGetUniformLocation(prog_uint, "scale");
 		assert(uint_scale_loc != -1);
 		break;
 	default:;