Delete spurious version checks

Remove check for:

1. GLSL version checks that are redundant with GL version checks (e.g.,
checking for GLSL 1.30 when the test already required OpenGL 3.0).

2. GL version checks that are redundant with the requirements section.

3. One call to piglit_require_GLSL() when no GLSL related API calls are
made.

46 files changed, 1 insertions, 70 deletions

diff --git a/tests/shaders/unsuccessful-relink.c b/tests/shaders/unsuccessful-relink.c
index cc99de323..dbd6aa2cf 100644
--- a/tests/shaders/unsuccessful-relink.c
+++ b/tests/shaders/unsuccessful-relink.c
@@ -198,6 +198,4 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-        piglit_require_gl_version(20);
-        piglit_require_GLSL_version(110);
 }
diff --git a/tests/spec/arb_cull_distance/exceed-limits.c b/tests/spec/arb_cull_distance/exceed-limits.c
index 15304b752..df7a81880 100644
--- a/tests/spec/arb_cull_distance/exceed-limits.c
+++ b/tests/spec/arb_cull_distance/exceed-limits.c
@@ -93,8 +93,6 @@ piglit_init(int argc, char **argv)
 		 use_cull, cull_distances);
 
 	piglit_require_gl_version(30);
-	piglit_require_GLSL();
-	piglit_require_GLSL_version(130);
 	piglit_require_extension("GL_ARB_cull_distance");
 
 	vs = piglit_compile_shader_text_nothrow(GL_VERTEX_SHADER, vert);
diff --git a/tests/spec/arb_cull_distance/max-distances.c b/tests/spec/arb_cull_distance/max-distances.c
index 6eeb54b6d..ce7f8b2f2 100644
--- a/tests/spec/arb_cull_distance/max-distances.c
+++ b/tests/spec/arb_cull_distance/max-distances.c
@@ -166,8 +166,6 @@ void
 piglit_init(int argc, char **argv)
 {
 	piglit_require_gl_version(30);
-	piglit_require_GLSL();
-	piglit_require_GLSL_version(130);
 	piglit_require_extension("GL_ARB_cull_distance");
 	prog = piglit_build_simple_program(vert, frag);
 	glUseProgram(prog);
diff --git a/tests/spec/arb_draw_indirect/draw-arrays-shared-binding.c b/tests/spec/arb_draw_indirect/draw-arrays-shared-binding.c
index 45d11d474..8bca22a77 100644
--- a/tests/spec/arb_draw_indirect/draw-arrays-shared-binding.c
+++ b/tests/spec/arb_draw_indirect/draw-arrays-shared-binding.c
@@ -97,7 +97,6 @@ piglit_init(int argc, char **argv)
 {
 	GLuint prog, vbo, indirect;
 
-	piglit_require_GLSL();
 	piglit_require_extension("GL_ARB_draw_indirect");
 
 	prog = piglit_build_simple_program(vs_text, fs_text);
diff --git a/tests/spec/arb_enhanced_layouts/explicit-offset-bufferstorage.c b/tests/spec/arb_enhanced_layouts/explicit-offset-bufferstorage.c
index 438ba32f2..6b106b7b5 100644
--- a/tests/spec/arb_enhanced_layouts/explicit-offset-bufferstorage.c
+++ b/tests/spec/arb_enhanced_layouts/explicit-offset-bufferstorage.c
@@ -171,11 +171,8 @@ setup_ubos(void)
 void
 piglit_init(int argc, char **argv)
 {
-	piglit_require_GLSL_version(150); /* Required for named blocks */
 	piglit_require_extension("GL_ARB_enhanced_layouts");
-	piglit_require_extension("GL_ARB_uniform_buffer_object");
 	piglit_require_extension("GL_ARB_buffer_storage");
-	piglit_require_extension("GL_ARB_map_buffer_range");
 
 	prog = piglit_build_simple_program(vert_shader_text, frag_shader_text);
 	assert(prog);
diff --git a/tests/spec/arb_enhanced_layouts/gs-stream-location-aliasing.c b/tests/spec/arb_enhanced_layouts/gs-stream-location-aliasing.c
index 765431e98..5ce0ccde6 100644
--- a/tests/spec/arb_enhanced_layouts/gs-stream-location-aliasing.c
+++ b/tests/spec/arb_enhanced_layouts/gs-stream-location-aliasing.c
@@ -129,7 +129,6 @@ piglit_init(int argc, char **argv)
 	GLuint xfb[2];
 	GLuint vao;
 
-	piglit_require_GLSL_version(150);
 	piglit_require_extension("GL_ARB_transform_feedback3");
 	piglit_require_extension("GL_ARB_enhanced_layouts");
 
diff --git a/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c b/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c
index f2a558e34..69346ef0f 100644
--- a/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c
+++ b/tests/spec/arb_enhanced_layouts/transform-feedback-layout-qualifiers.c
@@ -380,7 +380,6 @@ piglit_init(int argc, char **argv)
 	GLuint vao;
 	struct test_config config;
 
-	piglit_require_GLSL_version(150);
 	piglit_require_extension("GL_ARB_transform_feedback3");
 	piglit_require_extension("GL_ARB_enhanced_layouts");
 
diff --git a/tests/spec/arb_enhanced_layouts/transform-feedback-layout-query-api.c b/tests/spec/arb_enhanced_layouts/transform-feedback-layout-query-api.c
index 05175b588..1916fbcb5 100644
--- a/tests/spec/arb_enhanced_layouts/transform-feedback-layout-query-api.c
+++ b/tests/spec/arb_enhanced_layouts/transform-feedback-layout-query-api.c
@@ -113,7 +113,6 @@ piglit_init(int argc, char **argv)
 	bool varying_idx[2] = { false, false };
 	GLuint prog;
 
-	piglit_require_GLSL_version(150);
 	piglit_require_extension("GL_ARB_transform_feedback3");
 	piglit_require_extension("GL_ARB_enhanced_layouts");
 
diff --git a/tests/spec/arb_framebuffer_object/blit-scaled-linear.cpp b/tests/spec/arb_framebuffer_object/blit-scaled-linear.cpp
index 5cf6a4906..17905be6e 100644
--- a/tests/spec/arb_framebuffer_object/blit-scaled-linear.cpp
+++ b/tests/spec/arb_framebuffer_object/blit-scaled-linear.cpp
@@ -38,7 +38,7 @@ const int pattern_width = 258; const int pattern_height = 258;
 
 PIGLIT_GL_TEST_CONFIG_BEGIN
 
-	config.supports_gl_compat_version = 20;
+	config.supports_gl_compat_version = 21;
 
 	config.window_width = pattern_width * 2;
 	config.window_height = pattern_height;
@@ -180,7 +180,6 @@ blit_scaled_linear_glsl(const Fbo *src_fbo, GLint samples)
 void
 piglit_init(int argc, char **argv)
 {
-	piglit_require_gl_version(21);
 	piglit_require_extension("GL_ARB_vertex_array_object");
 	piglit_require_GLSL_version(130);
 
diff --git a/tests/spec/arb_geometry_shader4/execution/vertices-in.c b/tests/spec/arb_geometry_shader4/execution/vertices-in.c
index c3f20662a..dfd934ec6 100644
--- a/tests/spec/arb_geometry_shader4/execution/vertices-in.c
+++ b/tests/spec/arb_geometry_shader4/execution/vertices-in.c
@@ -78,7 +78,6 @@ piglit_init(int argc, char **argv)
 	bool pass = true;
 
 	/* Requirements */
-	piglit_require_GLSL_version(130);
 	piglit_require_extension("GL_ARB_geometry_shader4");
 	piglit_require_extension("GL_EXT_transform_feedback");
 
diff --git a/tests/spec/arb_gpu_shader5/execution/emitstreamvertex_nodraw.c b/tests/spec/arb_gpu_shader5/execution/emitstreamvertex_nodraw.c
index 896d3b867..3b39549fa 100644
--- a/tests/spec/arb_gpu_shader5/execution/emitstreamvertex_nodraw.c
+++ b/tests/spec/arb_gpu_shader5/execution/emitstreamvertex_nodraw.c
@@ -136,7 +136,6 @@ piglit_init(int argc, char **argv)
 	GLint vs, fs, gs;
 	GLuint VertexArrayID;
 
-	piglit_require_GLSL_version(150);
 	piglit_require_extension("GL_ARB_gpu_shader5");
 
 	glGetIntegerv(GL_MAX_VERTEX_STREAMS, &max_streams);
diff --git a/tests/spec/arb_gpu_shader5/interpolateAtSample-different.c b/tests/spec/arb_gpu_shader5/interpolateAtSample-different.c
index 2366af6b3..90944607e 100644
--- a/tests/spec/arb_gpu_shader5/interpolateAtSample-different.c
+++ b/tests/spec/arb_gpu_shader5/interpolateAtSample-different.c
@@ -168,7 +168,6 @@ piglit_init(int argc, char**argv)
 	}
 
 	piglit_require_extension("GL_ARB_gpu_shader5");
-	piglit_require_GLSL_version(150);
 
 	if (use_uniform) {
 		programs[0] = create_program(-1);
diff --git a/tests/spec/arb_gpu_shader5/interpolateAtSample-dynamically-nonuniform.c b/tests/spec/arb_gpu_shader5/interpolateAtSample-dynamically-nonuniform.c
index bb15fc8b1..c8588cedf 100644
--- a/tests/spec/arb_gpu_shader5/interpolateAtSample-dynamically-nonuniform.c
+++ b/tests/spec/arb_gpu_shader5/interpolateAtSample-dynamically-nonuniform.c
@@ -234,7 +234,6 @@ piglit_init(int argc, char**argv)
 	int x, y, i, j;
 
 	piglit_require_extension("GL_ARB_gpu_shader5");
-	piglit_require_GLSL_version(150);
 
 	create_framebuffer(N_SAMPLES,
 			   &ms_fbo, &ms_rb);
diff --git a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c
index 88f9a8dab..b6dfd898a 100644
--- a/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c
+++ b/tests/spec/arb_gpu_shader_fp64/execution/double-gettransformfeedbackvarying.c
@@ -116,7 +116,6 @@ piglit_init(int argc, char **argv)
 	int i;
 
 	/* Set up test */
-	piglit_require_GLSL_version(150);
 	piglit_require_transform_feedback();
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
 
diff --git a/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-alu.c b/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-alu.c
index 5abb0fb6c..943dc6cea 100644
--- a/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-alu.c
+++ b/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-alu.c
@@ -82,8 +82,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
 
-	piglit_require_GLSL_version(150);
-
 	prog = piglit_build_simple_program(vs_pass_thru_text, fs_source);
 
 	glUseProgram(prog);
diff --git a/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-const.c b/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-const.c
index e3b7ed1a0..4c9bb5f68 100644
--- a/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-const.c
+++ b/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-const.c
@@ -70,8 +70,6 @@ piglit_init(int argc, char **argv)
 {
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
 
-	piglit_require_GLSL_version(150);
-
 	prog = piglit_build_simple_program(vs_pass_thru_text, fs_source);
 
 	glUseProgram(prog);
diff --git a/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-packing.c b/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-packing.c
index 8026a1191..f839e77ee 100644
--- a/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-packing.c
+++ b/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-packing.c
@@ -82,8 +82,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
 
-	piglit_require_GLSL_version(150);
-
 	prog = piglit_build_simple_program(vs_pass_thru_text, fs_source);
 
 	glUseProgram(prog);
diff --git a/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-ubo.c b/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-ubo.c
index 07091eec4..379602595 100644
--- a/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-ubo.c
+++ b/tests/spec/arb_gpu_shader_fp64/fs-non-uniform-control-flow-ubo.c
@@ -84,8 +84,6 @@ piglit_init(int argc, char **argv)
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
 	piglit_require_extension("GL_ARB_shading_language_420pack");
 
-	piglit_require_GLSL_version(150);
-
 	prog = piglit_build_simple_program(vs_pass_thru_text, fs_source);
 
 	glUseProgram(prog);
diff --git a/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-mixed-shader.c b/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-mixed-shader.c
index d2046be6c..043581b01 100644
--- a/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-mixed-shader.c
+++ b/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-mixed-shader.c
@@ -217,7 +217,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_shader_storage_buffer_object");
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
-	piglit_require_GLSL_version(150);
 
 	glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &num_vertex_ssbo);
 	if (num_vertex_ssbo < 1)
diff --git a/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-shader.c b/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-shader.c
index 0d1754d10..0fe636e42 100644
--- a/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-shader.c
+++ b/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std140-fp64-shader.c
@@ -193,7 +193,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_shader_storage_buffer_object");
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
-	piglit_require_GLSL_version(150);
 
 	glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &num_vertex_ssbo);
 	if (num_vertex_ssbo < 1)
diff --git a/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-mixed-shader.c b/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-mixed-shader.c
index 05d664182..b994b39ed 100644
--- a/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-mixed-shader.c
+++ b/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-mixed-shader.c
@@ -249,7 +249,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_shader_storage_buffer_object");
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
-	piglit_require_GLSL_version(150);
 
 	glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &num_vertex_ssbo);
 	if (num_vertex_ssbo < 1)
diff --git a/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-shader.c b/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-shader.c
index 9d9256791..314c510e3 100644
--- a/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-shader.c
+++ b/tests/spec/arb_gpu_shader_fp64/shader_storage/layout-std430-fp64-shader.c
@@ -227,7 +227,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_shader_storage_buffer_object");
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
-	piglit_require_GLSL_version(150);
 
 	glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &num_vertex_ssbo);
 	if (num_vertex_ssbo < 1)
diff --git a/tests/spec/arb_pipeline_statistics_query/pipeline_stats_clip.c b/tests/spec/arb_pipeline_statistics_query/pipeline_stats_clip.c
index 7e2133210..8b933aadd 100644
--- a/tests/spec/arb_pipeline_statistics_query/pipeline_stats_clip.c
+++ b/tests/spec/arb_pipeline_statistics_query/pipeline_stats_clip.c
@@ -105,9 +105,6 @@ piglit_init(int argc, char *argv[])
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	piglit_require_gl_version(11);
-	piglit_require_GLSL();
-
 	do_query_init(queries, ARRAY_SIZE(queries));
 
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_src);
diff --git a/tests/spec/arb_pipeline_statistics_query/pipeline_stats_geom.c b/tests/spec/arb_pipeline_statistics_query/pipeline_stats_geom.c
index fef41482d..3b165a52c 100644
--- a/tests/spec/arb_pipeline_statistics_query/pipeline_stats_geom.c
+++ b/tests/spec/arb_pipeline_statistics_query/pipeline_stats_geom.c
@@ -121,9 +121,6 @@ piglit_init(int argc, char *argv[])
 {
 	GLuint vs, gs, prog;
 
-	piglit_require_gl_version(15);
-	piglit_require_GLSL();
-
 	do_query_init(queries, ARRAY_SIZE(queries));
 
 	prog = glCreateProgram();
diff --git a/tests/spec/arb_pipeline_statistics_query/pipeline_stats_vert.c b/tests/spec/arb_pipeline_statistics_query/pipeline_stats_vert.c
index da9c90b36..bad7a80b6 100644
--- a/tests/spec/arb_pipeline_statistics_query/pipeline_stats_vert.c
+++ b/tests/spec/arb_pipeline_statistics_query/pipeline_stats_vert.c
@@ -105,9 +105,6 @@ piglit_init(int argc, char *argv[])
 {
 	GLuint vs, prog;
 
-	piglit_require_gl_version(11);
-	piglit_require_GLSL();
-
 #ifndef DISPLAY
 	glEnable(GL_RASTERIZER_DISCARD);
 #endif
diff --git a/tests/spec/arb_sample_shading/execution/builtin-gl-sample-id.cpp b/tests/spec/arb_sample_shading/execution/builtin-gl-sample-id.cpp
index 5ccef9097..113fa95f2 100644
--- a/tests/spec/arb_sample_shading/execution/builtin-gl-sample-id.cpp
+++ b/tests/spec/arb_sample_shading/execution/builtin-gl-sample-id.cpp
@@ -146,7 +146,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_texture_multisample");
 	piglit_require_extension("GL_ARB_sample_shading");
-	piglit_require_GLSL_version(140);
 
 	/* Skip the test if num_samples > GL_MAX_SAMPLES */
 	GLint max_samples;
diff --git a/tests/spec/arb_sample_shading/execution/samplemask.cpp b/tests/spec/arb_sample_shading/execution/samplemask.cpp
index ab9aebea1..4be7e3a52 100644
--- a/tests/spec/arb_sample_shading/execution/samplemask.cpp
+++ b/tests/spec/arb_sample_shading/execution/samplemask.cpp
@@ -482,7 +482,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_texture_multisample");
 	piglit_require_extension("GL_ARB_sample_shading");
-	piglit_require_GLSL_version(130);
 
 	partition_check_supported =
 		piglit_is_extension_supported("GL_ARB_gpu_shader5") &&
diff --git a/tests/spec/arb_separate_shader_objects/atomic-counter.c b/tests/spec/arb_separate_shader_objects/atomic-counter.c
index d6845b76a..a773b64c9 100644
--- a/tests/spec/arb_separate_shader_objects/atomic-counter.c
+++ b/tests/spec/arb_separate_shader_objects/atomic-counter.c
@@ -104,8 +104,6 @@ piglit_init(int argc, char **argv)
 	bool pass = true;
 	uint32_t counter = 0;
 
-	piglit_require_gl_version(31);
-	piglit_require_GLSL_version(150);
 	piglit_require_extension("GL_ARB_shader_atomic_counters");
 	piglit_require_extension("GL_ARB_separate_shader_objects");
 
diff --git a/tests/spec/arb_separate_shader_objects/rendezvous_by_name.c b/tests/spec/arb_separate_shader_objects/rendezvous_by_name.c
index b03e6288b..2137ee17f 100644
--- a/tests/spec/arb_separate_shader_objects/rendezvous_by_name.c
+++ b/tests/spec/arb_separate_shader_objects/rendezvous_by_name.c
@@ -248,8 +248,6 @@ void piglit_init(int argc, char **argv)
 	GLint max_varying;
 	bool pass = true;
 
-	piglit_require_vertex_shader();
-	piglit_require_fragment_shader();
 	piglit_require_GLSL_version(130); /* Support layout index on output color */
 	piglit_require_extension("GL_ARB_separate_shader_objects");
 	piglit_require_extension("GL_ARB_explicit_attrib_location");
diff --git a/tests/spec/arb_separate_shader_objects/rendezvous_by_name_interpolation.c b/tests/spec/arb_separate_shader_objects/rendezvous_by_name_interpolation.c
index b2fe9fe3c..28798bb32 100644
--- a/tests/spec/arb_separate_shader_objects/rendezvous_by_name_interpolation.c
+++ b/tests/spec/arb_separate_shader_objects/rendezvous_by_name_interpolation.c
@@ -155,8 +155,6 @@ void piglit_init(int argc, char **argv)
 	GLuint fs_prog_match[4];
 	GLuint fs_prog_unmatch[4];
 
-	piglit_require_vertex_shader();
-	piglit_require_fragment_shader();
 	piglit_require_GLSL_version(130); /* Support layout index on output color */
 	piglit_require_extension("GL_ARB_separate_shader_objects");
 	piglit_require_extension("GL_ARB_explicit_attrib_location");
diff --git a/tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c b/tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c
index dc5290f2b..1f263faeb 100644
--- a/tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c
+++ b/tests/spec/arb_shader_storage_buffer_object/layout-std140-write-shader.c
@@ -122,7 +122,6 @@ piglit_init(int argc, char **argv)
 	GLint num_vertex_ssbo;
 
 	piglit_require_extension("GL_ARB_shader_storage_buffer_object");
-        piglit_require_GLSL_version(130);
 
 	glGetIntegerv(GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS, &num_vertex_ssbo);
 	if (num_vertex_ssbo < 1)
diff --git a/tests/spec/arb_texture_barrier/blending-in-shader-arb.c b/tests/spec/arb_texture_barrier/blending-in-shader-arb.c
index 0ec28ee9b..ce19c2951 100644
--- a/tests/spec/arb_texture_barrier/blending-in-shader-arb.c
+++ b/tests/spec/arb_texture_barrier/blending-in-shader-arb.c
@@ -529,9 +529,7 @@ parse_args(int argc, char **argv)
 void
 piglit_init(int argc, char **argv)
 {
-        piglit_require_extension("GL_ARB_framebuffer_object");
         piglit_require_extension("GL_ARB_texture_barrier");
-        piglit_require_GLSL_version(130);
 
         parse_args(argc, argv);
 
diff --git a/tests/spec/arb_texture_barrier/texture-halves-ping-pong-operation-chain.c b/tests/spec/arb_texture_barrier/texture-halves-ping-pong-operation-chain.c
index 213059124..41a840148 100644
--- a/tests/spec/arb_texture_barrier/texture-halves-ping-pong-operation-chain.c
+++ b/tests/spec/arb_texture_barrier/texture-halves-ping-pong-operation-chain.c
@@ -188,9 +188,7 @@ initialize_program()
 void
 piglit_init(int argc, char **argv)
 {
-	piglit_require_extension("GL_ARB_framebuffer_object");
 	piglit_require_extension("GL_ARB_texture_barrier");
-	piglit_require_GLSL_version(130);
 
 	width = 256;
 	height = 128;
diff --git a/tests/spec/arb_texture_multisample/large-float-texture.c b/tests/spec/arb_texture_multisample/large-float-texture.c
index bbec55165..3c18ee25e 100644
--- a/tests/spec/arb_texture_multisample/large-float-texture.c
+++ b/tests/spec/arb_texture_multisample/large-float-texture.c
@@ -622,7 +622,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_texture_float");
 	piglit_require_extension("GL_ARB_texture_multisample");
-	piglit_require_GLSL_version(130);
 
 	if (maxSize == -1) {
 		glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxSize);
diff --git a/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c b/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c
index 3f724454f..d52174a56 100644
--- a/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c
+++ b/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c
@@ -250,7 +250,6 @@ piglit_init(int argc, char **argv)
 	GLuint xfb[2];
 	GLuint vao;
 
-	piglit_require_GLSL_version(150);
 	piglit_require_extension("GL_ARB_transform_feedback3");
 
 	gs_invocation_n = parse_args(argc, argv);
diff --git a/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c b/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c
index cb367b946..79571cb3d 100644
--- a/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c
+++ b/tests/spec/arb_vertex_attrib_64bit/execution/overlapping-locations.c
@@ -190,7 +190,6 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_extension("GL_ARB_vertex_attrib_64bit");
 	piglit_require_extension("GL_ARB_gpu_shader_fp64");
-	piglit_require_GLSL_version(150);
 	compile_shader();
 	if (!piglit_check_gl_error(GL_NO_ERROR))
 		piglit_report_result(PIGLIT_FAIL);
diff --git a/tests/spec/ext_transform_feedback/alignment.c b/tests/spec/ext_transform_feedback/alignment.c
index 0f03990ed..a85b9e8e7 100644
--- a/tests/spec/ext_transform_feedback/alignment.c
+++ b/tests/spec/ext_transform_feedback/alignment.c
@@ -126,7 +126,6 @@ void piglit_init(int argc, char **argv)
 	if (additional_offset > 12 || additional_offset % 4 != 0)
 		print_usage_and_exit(argv[0]);
 
-	piglit_require_GLSL_version(130);
 	piglit_require_gl_version(30);
 	piglit_require_transform_feedback();
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vstext);
diff --git a/tests/spec/ext_transform_feedback/buffer-usage.c b/tests/spec/ext_transform_feedback/buffer-usage.c
index d7fbe62c5..2f137b1a4 100644
--- a/tests/spec/ext_transform_feedback/buffer-usage.c
+++ b/tests/spec/ext_transform_feedback/buffer-usage.c
@@ -59,7 +59,6 @@ initialize_shader_and_xfb()
 	const char *varying = "tf";
 
 	piglit_require_gl_version(30);
-	piglit_require_GLSL_version(130);
 	piglit_require_transform_feedback();
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vstext);
 	prog = glCreateProgram();
diff --git a/tests/spec/ext_transform_feedback/get-buffer-state.c b/tests/spec/ext_transform_feedback/get-buffer-state.c
index 0ac0b9e44..3297f7fea 100644
--- a/tests/spec/ext_transform_feedback/get-buffer-state.c
+++ b/tests/spec/ext_transform_feedback/get-buffer-state.c
@@ -205,7 +205,6 @@ piglit_init(int argc, char **argv)
 		print_usage_and_exit(argv[0]);
 	test = find_matching_test(argv[0], argv[1]);
 
-	piglit_require_GLSL();
 	piglit_require_transform_feedback();
 
 	piglit_report_result(do_test(test) ? PIGLIT_PASS : PIGLIT_FAIL);
diff --git a/tests/spec/ext_transform_feedback/order.c b/tests/spec/ext_transform_feedback/order.c
index f0e69649f..62f83b212 100644
--- a/tests/spec/ext_transform_feedback/order.c
+++ b/tests/spec/ext_transform_feedback/order.c
@@ -140,7 +140,6 @@ initialize_shader_and_xfb()
 	GLuint vs;
 
 	piglit_require_gl_version(30);
-	piglit_require_GLSL_version(130);
 	piglit_require_transform_feedback();
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vstext);
 	prog = glCreateProgram();
diff --git a/tests/spec/gl-2.0/vertex-program-two-side.c b/tests/spec/gl-2.0/vertex-program-two-side.c
index 4344fadcb..f7f919434 100644
--- a/tests/spec/gl-2.0/vertex-program-two-side.c
+++ b/tests/spec/gl-2.0/vertex-program-two-side.c
@@ -387,7 +387,6 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	piglit_require_GLSL();
 	piglit_require_gl_version(20);
 
 	printf("Window quadrants show:\n");
diff --git a/tests/spec/gl-3.0/texture-integer.c b/tests/spec/gl-3.0/texture-integer.c
index 4051e4e3a..587fd00b0 100644
--- a/tests/spec/gl-3.0/texture-integer.c
+++ b/tests/spec/gl-3.0/texture-integer.c
@@ -380,7 +380,6 @@ piglit_init(int argc, char **argv)
         static GLuint tex;
 
 	piglit_require_gl_version(30);
-	piglit_require_GLSL_version(130);
 
 	program = piglit_build_simple_program(NULL, FragShaderText);
 	glUseProgram(program);
diff --git a/tests/spec/glsl-1.10/execution/fragdepth.c b/tests/spec/glsl-1.10/execution/fragdepth.c
index 4deea6483..e40df9d73 100644
--- a/tests/spec/glsl-1.10/execution/fragdepth.c
+++ b/tests/spec/glsl-1.10/execution/fragdepth.c
@@ -105,8 +105,6 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	piglit_require_GLSL();
-
 	program = piglit_build_simple_program(vs_text, fs_text);
 
 	glClearColor(0.25f, 0.25f, 0.25f, 1.0f);
diff --git a/tests/spec/glsl-1.10/execution/varying-packing/simple.c b/tests/spec/glsl-1.10/execution/varying-packing/simple.c
index b197acd92..cfa288fa5 100644
--- a/tests/spec/glsl-1.10/execution/varying-packing/simple.c
+++ b/tests/spec/glsl-1.10/execution/varying-packing/simple.c
@@ -503,8 +503,6 @@ piglit_init(int argc, char **argv)
 	} else
 		print_usage_and_exit(argv[0]);
 
-	piglit_require_gl_version(20);
-	piglit_require_GLSL_version(glsl_version);
 	if (test_type->base == BASE_TYPE_DOUBLE)
 		piglit_require_extension("GL_ARB_gpu_shader_fp64");
 	glGetIntegerv(GL_MAX_VARYING_FLOATS, &max_varying_floats);
diff --git a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c
index 62589840d..0ab3725f0 100644
--- a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c
+++ b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c
@@ -158,7 +158,6 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	piglit_require_GLSL();
 	piglit_require_GLSL_version(130);
 	prog = piglit_build_simple_program(vert, frag);
 	glUseProgram(prog);
diff --git a/tests/spec/glsl-1.50/execution/get-active-attrib-array.c b/tests/spec/glsl-1.50/execution/get-active-attrib-array.c
index e93856ff2..7a86c6a56 100644
--- a/tests/spec/glsl-1.50/execution/get-active-attrib-array.c
+++ b/tests/spec/glsl-1.50/execution/get-active-attrib-array.c
@@ -118,8 +118,6 @@ piglit_init(int argc, char **argv)
 	GLint active_attribs = 0;
 	GLint max_length = 0;
 
-	piglit_require_GLSL_version(150);
-
 	prog = piglit_build_simple_program(vs_source, fs_source);
 	glUseProgram(prog);