Remove fake GL_EXT_gpu_shader4 support

All of the shaders in these tests explicitly say, "#version 130".

2 files changed, 2 insertions, 15 deletions

diff --git a/tests/shaders/glsl-vs-int-attrib.c b/tests/shaders/glsl-vs-int-attrib.c
index e50232c68..92ff870d5 100644
--- a/tests/shaders/glsl-vs-int-attrib.c
+++ b/tests/shaders/glsl-vs-int-attrib.c
@@ -94,13 +94,7 @@ piglit_init(int argc, char **argv)
 	bool pass;
 
 	/* We need to be able to call glVertexAttribI1ui */
-	if (piglit_get_gl_version() < 30
-	    && !piglit_is_extension_supported("GL_EXT_gpu_shader4")) {
-		printf("OpenGL 3.0 or GL_EXT_gpu_shader4 is required.\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
-
-	piglit_require_GLSL_version(130);
+	piglit_require_gl_version(30);
 
 	pass = run_test();
 
diff --git a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c
index 99f267f41..35ed5f721 100644
--- a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c
+++ b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c
@@ -298,14 +298,7 @@ piglit_init(int argc, char **argv)
 
 	gl_version = strtod((char *) glGetString(GL_VERSION), NULL);
 
-	piglit_require_GLSL();
-	piglit_require_GLSL_version(130);
-
-	if (piglit_is_extension_supported("GL_EXT_gpu_shader4")) {
-		piglit_require_gl_version(21);
-	} else {
-		piglit_require_gl_version(30);
-	}
+	piglit_require_gl_version(30);
 
 	if (use_fbo) {
 		setup_fbo();