[Piglit] [PATCH 01/15] Stop using GLEW_VERSION_* macros

Paul Berry stereotype441 at gmail.com
Fri Mar 2 15:40:19 PST 2012


Several tests were checking the GL version using GLEW's GLEW_VERSION_*
macros.  This patch changes the tests to use piglit_get_gl_version(),
which provides the same functionality in a way that is not dependent
on GLEW.
---
 tests/bugs/fdo25614-genmipmap.c                    |    2 +-
 tests/bugs/fdo31934.c                              |    2 +-
 tests/bugs/point-sprite.c                          |    4 ++--
 tests/fbo/fbo-alphatest-nocolor.c                  |    2 +-
 tests/fbo/fbo-copypix.c                            |    2 +-
 tests/fbo/fbo-drawbuffers-blend-add.c              |    2 +-
 tests/fbo/fbo-drawbuffers-fragcolor.c              |    2 +-
 tests/fbo/fbo-drawbuffers-maxtargets.c             |    2 +-
 tests/fbo/fbo-fragcoord.c                          |    2 +-
 tests/fbo/fbo-fragcoord2.c                         |    2 +-
 tests/fbo/fbo-readdrawpix.c                        |    2 +-
 tests/general/bgra-sec-color-pointer.c             |    2 +-
 tests/general/bgra-vert-attrib-pointer.c           |    2 +-
 tests/general/blendminmax.c                        |    2 +-
 tests/general/blendsquare.c                        |    2 +-
 tests/general/clear-varray-2.0.c                   |    2 +-
 tests/general/draw-batch.c                         |    2 +-
 tests/general/draw-elements-base-vertex-neg.c      |    2 +-
 tests/general/draw-elements-vs-inputs.c            |    2 +-
 tests/general/draw-elements.c                      |    2 +-
 tests/general/draw-vertices-half-float.c           |    2 +-
 tests/general/draw-vertices.c                      |    2 +-
 tests/general/early-z.c                            |    2 +-
 tests/general/isbufferobj.c                        |    2 +-
 tests/general/occlusion-query-discard.c            |    2 +-
 tests/general/occlusion_query.c                    |    2 +-
 tests/general/stencil-twoside.c                    |    4 ++--
 tests/general/stencil-wrap.c                       |    2 +-
 tests/general/texunits.c                           |    2 +-
 tests/general/vao-element-array-buffer.c           |    2 +-
 tests/glx/glx-shader-sharing.c                     |    2 +-
 tests/shaders/activeprogram-bad-program.c          |    2 +-
 tests/shaders/activeprogram-get.c                  |    2 +-
 .../shaders/createshaderprogram-attached-shaders.c |    2 +-
 tests/shaders/createshaderprogram-bad-type.c       |    2 +-
 tests/shaders/fp-fog.c                             |    2 +-
 tests/shaders/fp-fragment-position.c               |    2 +-
 tests/shaders/fp-kil.c                             |    2 +-
 .../glsl-arb-fragment-coord-conventions-define.c   |    2 +-
 .../shaders/glsl-arb-fragment-coord-conventions.c  |    2 +-
 tests/shaders/glsl-bindattriblocation.c            |    2 +-
 tests/shaders/glsl-cos.c                           |    2 +-
 tests/shaders/glsl-deriv-varyings.c                |    2 +-
 tests/shaders/glsl-derivs.c                        |    2 +-
 tests/shaders/glsl-dlist-getattriblocation.c       |    2 +-
 tests/shaders/glsl-empty-vs-no-fs.c                |    2 +-
 tests/shaders/glsl-explicit-location-01.c          |    2 +-
 tests/shaders/glsl-explicit-location-02.c          |    2 +-
 tests/shaders/glsl-explicit-location-03.c          |    2 +-
 tests/shaders/glsl-explicit-location-04.c          |    2 +-
 tests/shaders/glsl-explicit-location-05.c          |    2 +-
 tests/shaders/glsl-fs-bug25902.c                   |    2 +-
 tests/shaders/glsl-fs-exp2.c                       |    2 +-
 tests/shaders/glsl-fs-flat-color.c                 |    2 +-
 tests/shaders/glsl-fs-fogcolor-statechange.c       |    2 +-
 tests/shaders/glsl-fs-fragcoord-zw-ortho.c         |    2 +-
 tests/shaders/glsl-fs-fragcoord-zw-perspective.c   |    2 +-
 tests/shaders/glsl-fs-fragcoord.c                  |    2 +-
 tests/shaders/glsl-fs-loop-nested.c                |    2 +-
 tests/shaders/glsl-fs-loop.c                       |    2 +-
 tests/shaders/glsl-fs-mix-constant.c               |    2 +-
 tests/shaders/glsl-fs-mix.c                        |    2 +-
 tests/shaders/glsl-fs-pointcoord.c                 |    2 +-
 tests/shaders/glsl-fs-raytrace-bug27060.c          |    2 +-
 tests/shaders/glsl-fs-sampler-numbering.c          |    2 +-
 tests/shaders/glsl-fs-shader-stencil-export.c      |    2 +-
 tests/shaders/glsl-fs-sqrt-branch.c                |    2 +-
 tests/shaders/glsl-fs-sqrt-zero.c                  |    2 +-
 tests/shaders/glsl-fs-texture2drect.c              |    2 +-
 tests/shaders/glsl-fs-texturecube-2.c              |    2 +-
 tests/shaders/glsl-fs-texturecube.c                |    2 +-
 .../shaders/glsl-fs-textureenvcolor-statechange.c  |    2 +-
 tests/shaders/glsl-fs-texturelod-01.c              |    2 +-
 tests/shaders/glsl-fs-user-varying-ff.c            |    2 +-
 tests/shaders/glsl-fwidth.c                        |    2 +-
 tests/shaders/glsl-getactiveuniform-array-size.c   |    2 +-
 tests/shaders/glsl-getactiveuniform-length.c       |    2 +-
 tests/shaders/glsl-getattriblocation.c             |    2 +-
 tests/shaders/glsl-invalid-asm-01.c                |    2 +-
 tests/shaders/glsl-invalid-asm-02.c                |    2 +-
 tests/shaders/glsl-kwin-blur-1.c                   |    2 +-
 tests/shaders/glsl-kwin-blur-2.c                   |    2 +-
 tests/shaders/glsl-light-model.c                   |    2 +-
 tests/shaders/glsl-link-bug30552.c                 |    2 +-
 tests/shaders/glsl-link-bug38015.c                 |    2 +-
 tests/shaders/glsl-link-empty-prog-01.c            |    2 +-
 tests/shaders/glsl-link-empty-prog-02.c            |    2 +-
 tests/shaders/glsl-link-initializer-03.c           |    2 +-
 tests/shaders/glsl-link-test.c                     |    4 ++--
 tests/shaders/glsl-lod-bias.c                      |    2 +-
 tests/shaders/glsl-mat-attribute.c                 |    2 +-
 tests/shaders/glsl-max-varyings.c                  |    2 +-
 tests/shaders/glsl-max-vertex-attrib.c             |    2 +-
 tests/shaders/glsl-novertexdata.c                  |    2 +-
 tests/shaders/glsl-orangebook-ch06-bump.c          |    2 +-
 tests/shaders/glsl-preprocessor-comments.c         |    2 +-
 tests/shaders/glsl-routing.c                       |    2 +-
 tests/shaders/glsl-sin.c                           |    2 +-
 tests/shaders/glsl-uniform-update.c                |    2 +-
 tests/shaders/glsl-unused-varying.c                |    2 +-
 tests/shaders/glsl-useprogram-displaylist.c        |    2 +-
 tests/shaders/glsl-vs-arrays.c                     |    2 +-
 tests/shaders/glsl-vs-functions.c                  |    2 +-
 tests/shaders/glsl-vs-if-bool.c                    |    2 +-
 tests/shaders/glsl-vs-loop-nested.c                |    2 +-
 tests/shaders/glsl-vs-loop.c                       |    2 +-
 tests/shaders/glsl-vs-mov-after-deref.c            |    2 +-
 tests/shaders/glsl-vs-mvp-statechange.c            |    2 +-
 tests/shaders/glsl-vs-normalscale.c                |    2 +-
 tests/shaders/glsl-vs-point-size.c                 |    2 +-
 tests/shaders/glsl-vs-raytrace-bug26691.c          |    2 +-
 tests/shaders/glsl-vs-sqrt-zero.c                  |    2 +-
 tests/shaders/glsl-vs-statechange-1.c              |    2 +-
 tests/shaders/glsl-vs-texturematrix-1.c            |    2 +-
 tests/shaders/glsl-vs-texturematrix-2.c            |    2 +-
 tests/shaders/glsl-vs-user-varying-ff.c            |    2 +-
 tests/shaders/link-mismatch-layout-01.c            |    2 +-
 tests/shaders/link-mismatch-layout-02.c            |    2 +-
 tests/shaders/link-mismatch-layout-03.c            |    2 +-
 tests/shaders/link-unresolved-function.c           |    2 +-
 tests/shaders/sso-simple.c                         |    2 +-
 tests/shaders/sso-uniforms-01.c                    |    2 +-
 tests/shaders/sso-uniforms-02.c                    |    2 +-
 tests/shaders/sso-user-varying-01.c                |    2 +-
 tests/shaders/sso-user-varying-02.c                |    2 +-
 tests/shaders/trinity-fp1.c                        |    2 +-
 tests/shaders/useprogram-flushverts-1.c            |    2 +-
 tests/shaders/useprogram-flushverts-2.c            |    2 +-
 tests/shaders/useprogram-inside-begin.c            |    2 +-
 tests/shaders/useprogram-refcount-1.c              |    2 +-
 tests/shaders/useshaderprogram-bad-program.c       |    2 +-
 tests/shaders/useshaderprogram-bad-type.c          |    2 +-
 tests/shaders/useshaderprogram-flushverts-1.c      |    2 +-
 tests/shaders/vp-ignore-input.c                    |    2 +-
 tests/shaders/vpfp-generic.cpp                     |    2 +-
 tests/spec/arb_copy_buffer/copy_buffer_coherency.c |    2 +-
 .../arb_es2_compatibility-fixed-type.c             |    2 +-
 ...rb_es2_compatibility-getshaderprecisionformat.c |    2 +-
 .../arb_es2_compatibility-maxvectors.c             |    2 +-
 .../arb_es2_compatibility-releaseshadercompiler.c  |    2 +-
 .../arb_es2_compatibility-shadercompiler.c         |    2 +-
 .../map_buffer_range_error_check.c                 |    2 +-
 .../arb_map_buffer_range/map_buffer_range_test.c   |    2 +-
 tests/spec/arb_robustness/draw-vbo-bounds.c        |    2 +-
 tests/spec/arb_transform_feedback2/draw-auto.c     |    2 +-
 .../draw-vertices-2101010.c                        |    2 +-
 tests/spec/ext_timer_query/time-elapsed.c          |    2 +-
 tests/spec/ext_transform_feedback/interleaved.c    |    2 +-
 tests/spec/ext_transform_feedback/output-type.c    |    2 +-
 tests/spec/ext_transform_feedback/position.c       |    2 +-
 tests/spec/ext_transform_feedback/separate.c       |    2 +-
 tests/spec/gl-2.0/vertex-program-two-side.c        |    2 +-
 .../required-renderbuffer-attachment-formats.c     |    2 +-
 tests/spec/gl-3.0/required-sized-texture-formats.c |    2 +-
 .../gl-3.0/required-texture-attachment-formats.c   |    2 +-
 .../nv_conditional_render/begin-while-active.c     |    2 +-
 tests/spec/nv_conditional_render/begin-zero.c      |    2 +-
 tests/spec/nv_conditional_render/bitmap.c          |    2 +-
 tests/spec/nv_conditional_render/blitframebuffer.c |    2 +-
 tests/spec/nv_conditional_render/clear.c           |    2 +-
 tests/spec/nv_conditional_render/copypixels.c      |    2 +-
 tests/spec/nv_conditional_render/copyteximage.c    |    2 +-
 tests/spec/nv_conditional_render/copytexsubimage.c |    2 +-
 tests/spec/nv_conditional_render/dlist.c           |    2 +-
 tests/spec/nv_conditional_render/drawpixels.c      |    2 +-
 tests/spec/nv_conditional_render/generatemipmap.c  |    2 +-
 tests/spec/nv_conditional_render/vertex_array.c    |    2 +-
 tests/texturing/depth-tex-modes-glsl.c             |    2 +-
 tests/texturing/fragment-and-vertex-texturing.c    |    2 +-
 tests/texturing/gen-nonzero-unit.c                 |    2 +-
 tests/texturing/lodbias.c                          |    2 +-
 tests/texturing/tex-miplevel-selection.c           |    2 +-
 tests/texturing/tex-skipped-unit.c                 |    2 +-
 tests/texturing/tex3d-maxsize.c                    |    2 +-
 tests/texturing/tex3d.c                            |    2 +-
 tests/texturing/texrect-many.c                     |    2 +-
 tests/util/piglit-framework.c                      |    2 +-
 tests/util/piglit-shader-gl.c                      |    6 +++---
 tests/util/piglit-transform-feedback.c             |    2 +-
 179 files changed, 184 insertions(+), 184 deletions(-)

diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c
index 4182ce2..aaaa3f9 100644
--- a/tests/bugs/fdo25614-genmipmap.c
+++ b/tests/bugs/fdo25614-genmipmap.c
@@ -60,7 +60,7 @@ piglit_init(int argc, char **argv)
 	(void) argc;
 	(void) argv;
 
-	if (!GLEW_VERSION_1_3) {
+	if (piglit_get_gl_version() < 13) {
 		printf("Requires OpenGL 1.3\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/bugs/fdo31934.c b/tests/bugs/fdo31934.c
index f4dfd62..1400d47 100644
--- a/tests/bugs/fdo31934.c
+++ b/tests/bugs/fdo31934.c
@@ -8,7 +8,7 @@ piglit_init(int argc, char *argv[])
 {
     GLuint id;
 
-    if (!GLEW_VERSION_1_5) {
+    if (piglit_get_gl_version() < 15) {
         printf("Requires OpenGL 1.5\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c
index 5ef1382..574b07d 100644
--- a/tests/bugs/point-sprite.c
+++ b/tests/bugs/point-sprite.c
@@ -77,7 +77,7 @@ enum piglit_result
 piglit_display(void)
 {
 	static const GLenum origins[2] = { GL_UPPER_LEFT, GL_LOWER_LEFT	};
-	const unsigned num_rows = (GLEW_VERSION_2_0) ? 2 : 1;
+	const unsigned num_rows = (piglit_get_gl_version() >= 20) ? 2 : 1;
 	GLboolean pass = GL_TRUE;
 	unsigned i;
 	unsigned j;
@@ -95,7 +95,7 @@ piglit_display(void)
 		/* OpenGL version must be at least 2.0 to support modifying
 		 * GL_POINT_SPRITE_COORD_ORIGIN.
 		 */
-		if (GLEW_VERSION_2_0)
+		if (piglit_get_gl_version() >= 20)
 			glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN,
 					  origins[i]);
 
diff --git a/tests/fbo/fbo-alphatest-nocolor.c b/tests/fbo/fbo-alphatest-nocolor.c
index a964cef..0bc37ee 100644
--- a/tests/fbo/fbo-alphatest-nocolor.c
+++ b/tests/fbo/fbo-alphatest-nocolor.c
@@ -159,7 +159,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLuint fs, vs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/fbo/fbo-copypix.c b/tests/fbo/fbo-copypix.c
index 87dde53..2a96f0b 100644
--- a/tests/fbo/fbo-copypix.c
+++ b/tests/fbo/fbo-copypix.c
@@ -209,7 +209,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_1_4) {
+	if (piglit_get_gl_version() < 14) {
 		printf("Requires OpenGL 1.4\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/fbo/fbo-drawbuffers-blend-add.c b/tests/fbo/fbo-drawbuffers-blend-add.c
index c5722fc..d41d9cd 100644
--- a/tests/fbo/fbo-drawbuffers-blend-add.c
+++ b/tests/fbo/fbo-drawbuffers-blend-add.c
@@ -229,7 +229,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/fbo/fbo-drawbuffers-fragcolor.c b/tests/fbo/fbo-drawbuffers-fragcolor.c
index 561ecf4..fdcaac3 100644
--- a/tests/fbo/fbo-drawbuffers-fragcolor.c
+++ b/tests/fbo/fbo-drawbuffers-fragcolor.c
@@ -178,7 +178,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/fbo/fbo-drawbuffers-maxtargets.c b/tests/fbo/fbo-drawbuffers-maxtargets.c
index 0615270..9fbf9ac 100644
--- a/tests/fbo/fbo-drawbuffers-maxtargets.c
+++ b/tests/fbo/fbo-drawbuffers-maxtargets.c
@@ -186,7 +186,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c
index 830214b..60ffd5b 100644
--- a/tests/fbo/fbo-fragcoord.c
+++ b/tests/fbo/fbo-fragcoord.c
@@ -139,7 +139,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c
index 48230e4..3823b15 100644
--- a/tests/fbo/fbo-fragcoord2.c
+++ b/tests/fbo/fbo-fragcoord2.c
@@ -208,7 +208,7 @@ piglit_init(int argc, char**argv)
 {
    GLuint vs, fs;
 
-   if (!GLEW_VERSION_2_0) {
+   if (piglit_get_gl_version() < 20) {
       printf("Requires OpenGL 2.0\n");
       piglit_report_result(PIGLIT_SKIP);
    }
diff --git a/tests/fbo/fbo-readdrawpix.c b/tests/fbo/fbo-readdrawpix.c
index 0e879c9..c17c8af 100644
--- a/tests/fbo/fbo-readdrawpix.c
+++ b/tests/fbo/fbo-readdrawpix.c
@@ -212,7 +212,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_1_4) {
+	if (piglit_get_gl_version() < 14) {
 		printf("Requires OpenGL 1.4\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c
index 87a21e4..e94f545 100644
--- a/tests/general/bgra-sec-color-pointer.c
+++ b/tests/general/bgra-sec-color-pointer.c
@@ -50,7 +50,7 @@ static GLubyte colors[16] = {255, 0, 0, 127,
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_1_4) {
+	if (piglit_get_gl_version() < 14) {
 		printf("Requires OpenGL 1.4\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c
index 176f655..7f0d53f 100644
--- a/tests/general/bgra-vert-attrib-pointer.c
+++ b/tests/general/bgra-vert-attrib-pointer.c
@@ -108,7 +108,7 @@ compileLinkProg(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c
index 172c5b0..ece1721 100644
--- a/tests/general/blendminmax.c
+++ b/tests/general/blendminmax.c
@@ -130,7 +130,7 @@ piglit_init(int argc, char **argv)
 		piglit_report_result(PIGLIT_SKIP);
 	}
 
-	if (!GLEW_VERSION_1_4) {
+	if (piglit_get_gl_version() < 14) {
 		printf("Requires OpenGL 1.4\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c
index 3f2302c..c0ba61f 100644
--- a/tests/general/blendsquare.c
+++ b/tests/general/blendsquare.c
@@ -89,7 +89,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_1_4 && !GLEW_NV_blend_square) {
+	if (piglit_get_gl_version() < 14 && !GLEW_NV_blend_square) {
 		printf("Sorry, this program requires either OpenGL 1.4 or "
 		       "GL_NV_blend_square\n");
 		piglit_report_result(PIGLIT_SKIP);
diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c
index e9763e0..ac853e4 100644
--- a/tests/general/clear-varray-2.0.c
+++ b/tests/general/clear-varray-2.0.c
@@ -127,7 +127,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint vert_prog, frag_prog;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c
index 150cf7b..a9cc120 100644
--- a/tests/general/draw-batch.c
+++ b/tests/general/draw-batch.c
@@ -30,7 +30,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_1_4) {
+	if (piglit_get_gl_version() < 14) {
 		printf("Requires OpenGL 1.4.\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c
index 26c01c5..ce45d74 100644
--- a/tests/general/draw-elements-base-vertex-neg.c
+++ b/tests/general/draw-elements-base-vertex-neg.c
@@ -44,7 +44,7 @@ void piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		printf("Requires OpenGL 1.5\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c
index f376070..53e91c1 100644
--- a/tests/general/draw-elements-vs-inputs.c
+++ b/tests/general/draw-elements-vs-inputs.c
@@ -49,7 +49,7 @@ piglit_init(int argc, char **argv)
 {
    GLfloat red[4] = {1, 0, 0, 1};
 
-   if (!GLEW_VERSION_1_2) {
+   if (piglit_get_gl_version() < 12) {
       printf("Requires OpenGL 1.2\n");
       piglit_report_result(PIGLIT_SKIP);
    }
diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c
index 2356f10..ea3b926 100644
--- a/tests/general/draw-elements.c
+++ b/tests/general/draw-elements.c
@@ -49,7 +49,7 @@ void piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		printf("Requires OpenGL 1.5\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c
index b076f79..cbb069f 100644
--- a/tests/general/draw-vertices-half-float.c
+++ b/tests/general/draw-vertices-half-float.c
@@ -49,7 +49,7 @@ void piglit_init(int argc, char **argv)
 
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (!GLEW_VERSION_1_5) {
+    if (piglit_get_gl_version() < 15) {
         printf("Requires OpenGL 1.5\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c
index a5b4326..81408c2 100644
--- a/tests/general/draw-vertices.c
+++ b/tests/general/draw-vertices.c
@@ -49,7 +49,7 @@ void piglit_init(int argc, char **argv)
 
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (!GLEW_VERSION_1_5) {
+    if (piglit_get_gl_version() < 15) {
         printf("Requires OpenGL 1.5\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/general/early-z.c b/tests/general/early-z.c
index ae5a594..a8eca34 100644
--- a/tests/general/early-z.c
+++ b/tests/general/early-z.c
@@ -144,7 +144,7 @@ piglit_init(int argc, char **argv)
 {
    int i;
 
-   if (!GLEW_VERSION_2_0) {
+   if (piglit_get_gl_version() < 20) {
       printf("Requires OpenGL 2.0 / GLSL\n");
       piglit_report_result(PIGLIT_SKIP);
    }
diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c
index 80ac737..4f7141a 100644
--- a/tests/general/isbufferobj.c
+++ b/tests/general/isbufferobj.c
@@ -100,7 +100,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char**argv)
 {
-   if (!GLEW_VERSION_1_5) {
+   if (piglit_get_gl_version() < 15) {
       printf("Requires OpenGL 1.5\n");
       piglit_report_result(PIGLIT_SKIP);
    }
diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c
index cefd089..88b039c 100644
--- a/tests/general/occlusion-query-discard.c
+++ b/tests/general/occlusion-query-discard.c
@@ -126,7 +126,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint query_bits;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/general/occlusion_query.c b/tests/general/occlusion_query.c
index 756e252..9ed4ded 100644
--- a/tests/general/occlusion_query.c
+++ b/tests/general/occlusion_query.c
@@ -173,7 +173,7 @@ piglit_init(int argc, char **argv)
 	glDepthFunc(GL_LESS);
 
 
-	if (GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() >= 15) {
 		gen_queries = GLEW_GET_FUN(__glewGenQueries);
 		begin_query = GLEW_GET_FUN(__glewBeginQuery);
 		end_query = GLEW_GET_FUN(__glewEndQuery);
diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c
index 56cfd81..fb92458 100644
--- a/tests/general/stencil-twoside.c
+++ b/tests/general/stencil-twoside.c
@@ -217,13 +217,13 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_ATI_separate_stencil && !GLEW_VERSION_2_0) {
+	if (!GLEW_ATI_separate_stencil && piglit_get_gl_version() < 20) {
 		printf("Sorry, this program requires either "
 		       "GL_ATI_separate_stencil or OpenGL 2.0.\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		use20syntax = 0;
 	}
 
diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c
index 6c4f8dc..388ddba 100644
--- a/tests/general/stencil-wrap.c
+++ b/tests/general/stencil-wrap.c
@@ -144,7 +144,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_EXT_stencil_wrap && !GLEW_VERSION_1_4) {
+	if (!GLEW_EXT_stencil_wrap && piglit_get_gl_version() < 14) {
 		printf("Sorry, this program requires either "
 		       "GL_EXT_stencil_wrap or OpenGL 1.4.\n");
 		piglit_report_result(PIGLIT_SKIP);
diff --git a/tests/general/texunits.c b/tests/general/texunits.c
index e691724..c2f5bb5 100644
--- a/tests/general/texunits.c
+++ b/tests/general/texunits.c
@@ -384,7 +384,7 @@ init(void)
 void
 piglit_init(int argc, char *argv[])
 {
-   if (!GLEW_VERSION_1_3) {
+   if (piglit_get_gl_version() < 13) {
 	   printf("Requires OpenGL 1.3\n");
 	   piglit_report_result(PIGLIT_SKIP);
    }
diff --git a/tests/general/vao-element-array-buffer.c b/tests/general/vao-element-array-buffer.c
index 6079e1f..fc438ef 100644
--- a/tests/general/vao-element-array-buffer.c
+++ b/tests/general/vao-element-array-buffer.c
@@ -68,7 +68,7 @@ piglit_init(int argc, char **argv)
 	};
 	GLubyte indices[] = {0, 1, 2, 3};
 
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		printf("Requires OpenGL 1.5\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/glx/glx-shader-sharing.c b/tests/glx/glx-shader-sharing.c
index bed19c2..583879a 100644
--- a/tests/glx/glx-shader-sharing.c
+++ b/tests/glx/glx-shader-sharing.c
@@ -90,7 +90,7 @@ draw(Display *dpy)
 
    glewInit();
 
-   if (!GLEW_VERSION_2_0) {
+   if (piglit_get_gl_version() < 20) {
       printf("%s: Requires OpenGL 2.0\n", TestName);
       return PIGLIT_SKIP;
    }
diff --git a/tests/shaders/activeprogram-bad-program.c b/tests/shaders/activeprogram-bad-program.c
index f87a94e..a4025bf 100644
--- a/tests/shaders/activeprogram-bad-program.c
+++ b/tests/shaders/activeprogram-bad-program.c
@@ -54,7 +54,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint vs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/activeprogram-get.c b/tests/shaders/activeprogram-get.c
index b0fd2c3..04526ee 100644
--- a/tests/shaders/activeprogram-get.c
+++ b/tests/shaders/activeprogram-get.c
@@ -49,7 +49,7 @@ piglit_init(int argc, char **argv)
 	GLuint got;
 	GLuint vs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/createshaderprogram-attached-shaders.c b/tests/shaders/createshaderprogram-attached-shaders.c
index c54c5bc..12c2fea 100644
--- a/tests/shaders/createshaderprogram-attached-shaders.c
+++ b/tests/shaders/createshaderprogram-attached-shaders.c
@@ -50,7 +50,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLenum err;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/createshaderprogram-bad-type.c b/tests/shaders/createshaderprogram-bad-type.c
index 3151379..8871fcf 100644
--- a/tests/shaders/createshaderprogram-bad-type.c
+++ b/tests/shaders/createshaderprogram-bad-type.c
@@ -110,7 +110,7 @@ piglit_init(int argc, char **argv)
 		? 0 : GL_INVALID_ENUM;
 	GLboolean pass;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/fp-fog.c b/tests/shaders/fp-fog.c
index aa30f35..cbc0dc9 100644
--- a/tests/shaders/fp-fog.c
+++ b/tests/shaders/fp-fog.c
@@ -134,7 +134,7 @@ piglit_init(int argc, char **argv)
 
 	glClearColor(0.3, 0.3, 0.3, 0.3);
 
-	if (GLEW_VERSION_1_4) {
+	if (piglit_get_gl_version() >= 14) {
 		pglFogCoordf = glFogCoordf;
 	} else if (GLEW_EXT_fog_coord) {
 		pglFogCoordf = glFogCoordfEXT;
diff --git a/tests/shaders/fp-fragment-position.c b/tests/shaders/fp-fragment-position.c
index b2f34a7..3859d1c 100644
--- a/tests/shaders/fp-fragment-position.c
+++ b/tests/shaders/fp-fragment-position.c
@@ -274,7 +274,7 @@ piglit_init(int argc, char **argv)
 	GLubyte rectangle[200][200][4];
 	GLubyte tex[256*256][4];
 
-	if (!GLEW_VERSION_1_3) {
+	if (piglit_get_gl_version() < 13) {
 		printf("Requires OpenGL 1.3\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/fp-kil.c b/tests/shaders/fp-kil.c
index 3999d19..b32361d 100644
--- a/tests/shaders/fp-kil.c
+++ b/tests/shaders/fp-kil.c
@@ -278,7 +278,7 @@ piglit_init(int argc, char **argv)
 
 	glutReshapeFunc(Reshape);
 
-	if (!GLEW_VERSION_1_3) {
+	if (piglit_get_gl_version() < 13) {
 		printf("Requires OpenGL 1.3\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
index b09bd4f..2747081 100644
--- a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
+++ b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
@@ -61,7 +61,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions.c b/tests/shaders/glsl-arb-fragment-coord-conventions.c
index 81648b6..e6f81a5 100644
--- a/tests/shaders/glsl-arb-fragment-coord-conventions.c
+++ b/tests/shaders/glsl-arb-fragment-coord-conventions.c
@@ -218,7 +218,7 @@ static void key_func(unsigned char key, int x, int y)
 void
 piglit_init(int argc, char **argv)
 {
-   if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
       printf("Requires OpenGL 2.0\n");
       piglit_report_result(PIGLIT_SKIP);
    }
diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c
index dd1ebde..aa389ce 100644
--- a/tests/shaders/glsl-bindattriblocation.c
+++ b/tests/shaders/glsl-bindattriblocation.c
@@ -126,7 +126,7 @@ piglit_init(int argc, char **argv)
 {
 	piglit_require_vertex_shader();
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 		exit(1);
diff --git a/tests/shaders/glsl-cos.c b/tests/shaders/glsl-cos.c
index 14dc907..6e3867f 100644
--- a/tests/shaders/glsl-cos.c
+++ b/tests/shaders/glsl-cos.c
@@ -109,7 +109,7 @@ enum piglit_result piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-    if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
         printf("Requires OpenGL 2.0\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/shaders/glsl-deriv-varyings.c b/tests/shaders/glsl-deriv-varyings.c
index 3b49020..fe37326 100644
--- a/tests/shaders/glsl-deriv-varyings.c
+++ b/tests/shaders/glsl-deriv-varyings.c
@@ -87,7 +87,7 @@ static const char *fragShaderText2 =
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-derivs.c b/tests/shaders/glsl-derivs.c
index 7f350fb..c2c155e 100644
--- a/tests/shaders/glsl-derivs.c
+++ b/tests/shaders/glsl-derivs.c
@@ -86,7 +86,7 @@ static const char *fragShaderText2 =
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-dlist-getattriblocation.c b/tests/shaders/glsl-dlist-getattriblocation.c
index 7829218..e331014 100644
--- a/tests/shaders/glsl-dlist-getattriblocation.c
+++ b/tests/shaders/glsl-dlist-getattriblocation.c
@@ -95,7 +95,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 		exit(1);
diff --git a/tests/shaders/glsl-empty-vs-no-fs.c b/tests/shaders/glsl-empty-vs-no-fs.c
index 1954e4d..efa9d22 100644
--- a/tests/shaders/glsl-empty-vs-no-fs.c
+++ b/tests/shaders/glsl-empty-vs-no-fs.c
@@ -73,7 +73,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-explicit-location-01.c b/tests/shaders/glsl-explicit-location-01.c
index 6a91031..ada2b55 100644
--- a/tests/shaders/glsl-explicit-location-01.c
+++ b/tests/shaders/glsl-explicit-location-01.c
@@ -48,7 +48,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	GLboolean ok;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-explicit-location-02.c b/tests/shaders/glsl-explicit-location-02.c
index f040012..9cf2dfc 100644
--- a/tests/shaders/glsl-explicit-location-02.c
+++ b/tests/shaders/glsl-explicit-location-02.c
@@ -51,7 +51,7 @@ void piglit_init(int argc, char **argv)
 	GLint loc;
 	GLboolean ok;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-explicit-location-03.c b/tests/shaders/glsl-explicit-location-03.c
index 27b4fea..9970160 100644
--- a/tests/shaders/glsl-explicit-location-03.c
+++ b/tests/shaders/glsl-explicit-location-03.c
@@ -48,7 +48,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	GLboolean ok;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-explicit-location-04.c b/tests/shaders/glsl-explicit-location-04.c
index c1ae761..fbd31ac 100644
--- a/tests/shaders/glsl-explicit-location-04.c
+++ b/tests/shaders/glsl-explicit-location-04.c
@@ -45,7 +45,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	GLboolean ok;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-explicit-location-05.c b/tests/shaders/glsl-explicit-location-05.c
index 75474f8..fd58085 100644
--- a/tests/shaders/glsl-explicit-location-05.c
+++ b/tests/shaders/glsl-explicit-location-05.c
@@ -50,7 +50,7 @@ void piglit_init(int argc, char **argv)
 	GLboolean ok;
 	GLint loc;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-bug25902.c b/tests/shaders/glsl-fs-bug25902.c
index cdb29eb..4d1bbf4 100644
--- a/tests/shaders/glsl-fs-bug25902.c
+++ b/tests/shaders/glsl-fs-bug25902.c
@@ -72,7 +72,7 @@ piglit_init(int argc, char **argv)
 	float black[4] = {0.0, 0.0, 0.0, 0.0};
 	float white[4] = {1.0, 1.0, 1.0, 0.0};
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c
index f76e2da..55d8bed 100644
--- a/tests/shaders/glsl-fs-exp2.c
+++ b/tests/shaders/glsl-fs-exp2.c
@@ -66,7 +66,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-flat-color.c b/tests/shaders/glsl-fs-flat-color.c
index 9f275f2..6f2cf24 100644
--- a/tests/shaders/glsl-fs-flat-color.c
+++ b/tests/shaders/glsl-fs-flat-color.c
@@ -94,7 +94,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-fogcolor-statechange.c b/tests/shaders/glsl-fs-fogcolor-statechange.c
index e625eaa..c865043 100644
--- a/tests/shaders/glsl-fs-fogcolor-statechange.c
+++ b/tests/shaders/glsl-fs-fogcolor-statechange.c
@@ -70,7 +70,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = gl_Fog.color;\n"
 		"}\n";
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c
index e7d6992..7b15fb5 100644
--- a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c
+++ b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c
@@ -114,7 +114,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs, prog;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c
index 8b23079..352e9e9 100644
--- a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c
+++ b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c
@@ -135,7 +135,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs, prog;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-fragcoord.c b/tests/shaders/glsl-fs-fragcoord.c
index 47555e3..e00efc8 100644
--- a/tests/shaders/glsl-fs-fragcoord.c
+++ b/tests/shaders/glsl-fs-fragcoord.c
@@ -72,7 +72,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-loop-nested.c b/tests/shaders/glsl-fs-loop-nested.c
index e984c26..d458ce7 100644
--- a/tests/shaders/glsl-fs-loop-nested.c
+++ b/tests/shaders/glsl-fs-loop-nested.c
@@ -104,7 +104,7 @@ piglit_init(int argc, char **argv)
 	 */
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-loop.c b/tests/shaders/glsl-fs-loop.c
index e8c6ff0..b7634d7 100644
--- a/tests/shaders/glsl-fs-loop.c
+++ b/tests/shaders/glsl-fs-loop.c
@@ -102,7 +102,7 @@ piglit_init(int argc, char **argv)
 	 */
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-mix-constant.c b/tests/shaders/glsl-fs-mix-constant.c
index 2f2fa76..e2482e4 100644
--- a/tests/shaders/glsl-fs-mix-constant.c
+++ b/tests/shaders/glsl-fs-mix-constant.c
@@ -61,7 +61,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-mix.c b/tests/shaders/glsl-fs-mix.c
index 6800610..ed77b38 100644
--- a/tests/shaders/glsl-fs-mix.c
+++ b/tests/shaders/glsl-fs-mix.c
@@ -68,7 +68,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c
index f253103..586789f 100644
--- a/tests/shaders/glsl-fs-pointcoord.c
+++ b/tests/shaders/glsl-fs-pointcoord.c
@@ -92,7 +92,7 @@ void piglit_init(int argc, char**argv)
 	GLint vs, fs;
 	GLint point_size_limits[2];
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 		exit(1);
diff --git a/tests/shaders/glsl-fs-raytrace-bug27060.c b/tests/shaders/glsl-fs-raytrace-bug27060.c
index 2bc986f..cfd87c8 100644
--- a/tests/shaders/glsl-fs-raytrace-bug27060.c
+++ b/tests/shaders/glsl-fs-raytrace-bug27060.c
@@ -280,7 +280,7 @@ piglit_init(int argc, char **argv)
 
   glDisable(GL_DEPTH_TEST);
 
-  if (!GLEW_VERSION_2_0) {
+  if (piglit_get_gl_version() < 20) {
     printf("Requires OpenGL 2.0\n");
     piglit_report_result(PIGLIT_SKIP);
   }
diff --git a/tests/shaders/glsl-fs-sampler-numbering.c b/tests/shaders/glsl-fs-sampler-numbering.c
index c3e8b95..1fe89cd 100644
--- a/tests/shaders/glsl-fs-sampler-numbering.c
+++ b/tests/shaders/glsl-fs-sampler-numbering.c
@@ -72,7 +72,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-shader-stencil-export.c b/tests/shaders/glsl-fs-shader-stencil-export.c
index 70d947f..10590ce 100644
--- a/tests/shaders/glsl-fs-shader-stencil-export.c
+++ b/tests/shaders/glsl-fs-shader-stencil-export.c
@@ -65,7 +65,7 @@ piglit_init(int argc, char **argv)
 	GLint vs, fs;
 
 	piglit_require_extension("GL_ARB_shader_stencil_export");
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-sqrt-branch.c b/tests/shaders/glsl-fs-sqrt-branch.c
index 054909b..c289be4 100644
--- a/tests/shaders/glsl-fs-sqrt-branch.c
+++ b/tests/shaders/glsl-fs-sqrt-branch.c
@@ -66,7 +66,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-sqrt-zero.c b/tests/shaders/glsl-fs-sqrt-zero.c
index 512625e..aa74e7a 100644
--- a/tests/shaders/glsl-fs-sqrt-zero.c
+++ b/tests/shaders/glsl-fs-sqrt-zero.c
@@ -60,7 +60,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-texture2drect.c b/tests/shaders/glsl-fs-texture2drect.c
index 364ea24..7dadbf3 100644
--- a/tests/shaders/glsl-fs-texture2drect.c
+++ b/tests/shaders/glsl-fs-texture2drect.c
@@ -138,7 +138,7 @@ void piglit_init(int argc, char **argv)
 			proj4 = GL_TRUE;
 	}
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-texturecube-2.c b/tests/shaders/glsl-fs-texturecube-2.c
index 7f409ce..b86c35a 100644
--- a/tests/shaders/glsl-fs-texturecube-2.c
+++ b/tests/shaders/glsl-fs-texturecube-2.c
@@ -201,7 +201,7 @@ void piglit_init(int argc, char **argv)
 			bias = GL_TRUE;
 	}
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-texturecube.c b/tests/shaders/glsl-fs-texturecube.c
index 5880945..6bc452a 100644
--- a/tests/shaders/glsl-fs-texturecube.c
+++ b/tests/shaders/glsl-fs-texturecube.c
@@ -165,7 +165,7 @@ void piglit_init(int argc, char **argv)
 			bias = GL_TRUE;
 	}
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-textureenvcolor-statechange.c b/tests/shaders/glsl-fs-textureenvcolor-statechange.c
index ba17f6d..82281b0 100644
--- a/tests/shaders/glsl-fs-textureenvcolor-statechange.c
+++ b/tests/shaders/glsl-fs-textureenvcolor-statechange.c
@@ -70,7 +70,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = gl_TextureEnvColor[0];\n"
 		"}\n";
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-texturelod-01.c b/tests/shaders/glsl-fs-texturelod-01.c
index 0dc88f0..25313dc 100644
--- a/tests/shaders/glsl-fs-texturelod-01.c
+++ b/tests/shaders/glsl-fs-texturelod-01.c
@@ -125,7 +125,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs, prog, sampler_uniform;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fs-user-varying-ff.c b/tests/shaders/glsl-fs-user-varying-ff.c
index dc62e73..3853066 100644
--- a/tests/shaders/glsl-fs-user-varying-ff.c
+++ b/tests/shaders/glsl-fs-user-varying-ff.c
@@ -71,7 +71,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-fwidth.c b/tests/shaders/glsl-fwidth.c
index a8a301f..659d214 100644
--- a/tests/shaders/glsl-fwidth.c
+++ b/tests/shaders/glsl-fwidth.c
@@ -84,7 +84,7 @@ static const char *fragShaderText2 =
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-getactiveuniform-array-size.c b/tests/shaders/glsl-getactiveuniform-array-size.c
index d8b8dab..de8c392 100644
--- a/tests/shaders/glsl-getactiveuniform-array-size.c
+++ b/tests/shaders/glsl-getactiveuniform-array-size.c
@@ -53,7 +53,7 @@ piglit_init(int argc, char **argv)
 	GLsizei size;
 	GLenum type;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-getactiveuniform-length.c b/tests/shaders/glsl-getactiveuniform-length.c
index be834d4..b4a2ffb 100644
--- a/tests/shaders/glsl-getactiveuniform-length.c
+++ b/tests/shaders/glsl-getactiveuniform-length.c
@@ -54,7 +54,7 @@ piglit_init(int argc, char **argv)
 	char *name;
 	GLsizei size;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c
index 80c3de5..c5d554b 100644
--- a/tests/shaders/glsl-getattriblocation.c
+++ b/tests/shaders/glsl-getattriblocation.c
@@ -114,7 +114,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 		exit(1);
diff --git a/tests/shaders/glsl-invalid-asm-01.c b/tests/shaders/glsl-invalid-asm-01.c
index 92392da..a6686bd 100644
--- a/tests/shaders/glsl-invalid-asm-01.c
+++ b/tests/shaders/glsl-invalid-asm-01.c
@@ -76,7 +76,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLenum err;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-invalid-asm-02.c b/tests/shaders/glsl-invalid-asm-02.c
index c37ed8d..b36a50c 100644
--- a/tests/shaders/glsl-invalid-asm-02.c
+++ b/tests/shaders/glsl-invalid-asm-02.c
@@ -75,7 +75,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLenum err;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-kwin-blur-1.c b/tests/shaders/glsl-kwin-blur-1.c
index b29ce9b..8f48993 100644
--- a/tests/shaders/glsl-kwin-blur-1.c
+++ b/tests/shaders/glsl-kwin-blur-1.c
@@ -227,7 +227,7 @@ enum piglit_result piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-    if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
         printf("Requires OpenGL 2.0\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/shaders/glsl-kwin-blur-2.c b/tests/shaders/glsl-kwin-blur-2.c
index 04cda31..7c57e62 100644
--- a/tests/shaders/glsl-kwin-blur-2.c
+++ b/tests/shaders/glsl-kwin-blur-2.c
@@ -258,7 +258,7 @@ void piglit_init(int argc, char **argv)
 {
     int value;
 
-    if (!GLEW_VERSION_2_0) {
+    if (piglit_get_gl_version() < 20) {
         printf("Requires OpenGL 2.0\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/shaders/glsl-light-model.c b/tests/shaders/glsl-light-model.c
index 928e6d6..c785a3e 100644
--- a/tests/shaders/glsl-light-model.c
+++ b/tests/shaders/glsl-light-model.c
@@ -66,7 +66,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-link-bug30552.c b/tests/shaders/glsl-link-bug30552.c
index ee08803..0d9ad62 100644
--- a/tests/shaders/glsl-link-bug30552.c
+++ b/tests/shaders/glsl-link-bug30552.c
@@ -44,7 +44,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	GLboolean ok;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-link-bug38015.c b/tests/shaders/glsl-link-bug38015.c
index e34d590..ca31e6d 100644
--- a/tests/shaders/glsl-link-bug38015.c
+++ b/tests/shaders/glsl-link-bug38015.c
@@ -56,7 +56,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	const char *fs_text_ptr = fs_text;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-link-empty-prog-01.c b/tests/shaders/glsl-link-empty-prog-01.c
index 1c44884..de8ffce 100644
--- a/tests/shaders/glsl-link-empty-prog-01.c
+++ b/tests/shaders/glsl-link-empty-prog-01.c
@@ -45,7 +45,7 @@ enum piglit_result piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-    if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 	printf("Requires OpenGL 2.0\n");
 	piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/shaders/glsl-link-empty-prog-02.c b/tests/shaders/glsl-link-empty-prog-02.c
index d9a1789..8ab0490 100644
--- a/tests/shaders/glsl-link-empty-prog-02.c
+++ b/tests/shaders/glsl-link-empty-prog-02.c
@@ -88,7 +88,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-link-initializer-03.c b/tests/shaders/glsl-link-initializer-03.c
index e43548c..4ddd05b 100644
--- a/tests/shaders/glsl-link-initializer-03.c
+++ b/tests/shaders/glsl-link-initializer-03.c
@@ -54,7 +54,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog_c;
 	GLint prog_d;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-link-test.c b/tests/shaders/glsl-link-test.c
index a614c7f..909d3b2 100644
--- a/tests/shaders/glsl-link-test.c
+++ b/tests/shaders/glsl-link-test.c
@@ -47,7 +47,7 @@ void piglit_init(int argc, char **argv)
 	unsigned i;
 	const char *invalid_file = NULL;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
@@ -83,7 +83,7 @@ void piglit_init(int argc, char **argv)
 			target = GL_VERTEX_SHADER;
 		} else if (strcmp(argv[i] + len - 5, ".geom") == 0) {
 			target = GL_GEOMETRY_SHADER;
-			if (!GLEW_VERSION_3_2 && !GLEW_ARB_geometry_shader4) {
+			if (piglit_get_gl_version() < 32 && !GLEW_ARB_geometry_shader4) {
 				printf("Requires geometry shaders.\n");
 				piglit_report_result(PIGLIT_SKIP);
 			}
diff --git a/tests/shaders/glsl-lod-bias.c b/tests/shaders/glsl-lod-bias.c
index 9de328a..96dac05 100644
--- a/tests/shaders/glsl-lod-bias.c
+++ b/tests/shaders/glsl-lod-bias.c
@@ -79,7 +79,7 @@ static const float pink[4]        = {1.0, 0.0, 1.0, 0.0}; /* Note: 0.0 alpha */
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-mat-attribute.c b/tests/shaders/glsl-mat-attribute.c
index 16634ca..07d5dbb 100644
--- a/tests/shaders/glsl-mat-attribute.c
+++ b/tests/shaders/glsl-mat-attribute.c
@@ -198,7 +198,7 @@ void piglit_init(int argc, char **argv)
 
 	unsigned i;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-max-varyings.c b/tests/shaders/glsl-max-varyings.c
index 4592c87..40b232f 100644
--- a/tests/shaders/glsl-max-varyings.c
+++ b/tests/shaders/glsl-max-varyings.c
@@ -258,7 +258,7 @@ piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-max-vertex-attrib.c b/tests/shaders/glsl-max-vertex-attrib.c
index 666c2a1..e247a13 100644
--- a/tests/shaders/glsl-max-vertex-attrib.c
+++ b/tests/shaders/glsl-max-vertex-attrib.c
@@ -150,7 +150,7 @@ enum piglit_result piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 		exit(1);
diff --git a/tests/shaders/glsl-novertexdata.c b/tests/shaders/glsl-novertexdata.c
index b734764..16a5247 100644
--- a/tests/shaders/glsl-novertexdata.c
+++ b/tests/shaders/glsl-novertexdata.c
@@ -102,7 +102,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 		exit(1);
diff --git a/tests/shaders/glsl-orangebook-ch06-bump.c b/tests/shaders/glsl-orangebook-ch06-bump.c
index e712286..f47a36e 100644
--- a/tests/shaders/glsl-orangebook-ch06-bump.c
+++ b/tests/shaders/glsl-orangebook-ch06-bump.c
@@ -101,7 +101,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-preprocessor-comments.c b/tests/shaders/glsl-preprocessor-comments.c
index 9684576..37fbb1c 100644
--- a/tests/shaders/glsl-preprocessor-comments.c
+++ b/tests/shaders/glsl-preprocessor-comments.c
@@ -66,7 +66,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-routing.c b/tests/shaders/glsl-routing.c
index 6194f60..52d4410 100644
--- a/tests/shaders/glsl-routing.c
+++ b/tests/shaders/glsl-routing.c
@@ -318,7 +318,7 @@ void piglit_init(int argc, char **argv)
 {
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (!GLEW_VERSION_2_0) {
+    if (piglit_get_gl_version() < 20) {
         printf("Requires OpenGL 2.0\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/shaders/glsl-sin.c b/tests/shaders/glsl-sin.c
index 4c760fc..76cbed1 100644
--- a/tests/shaders/glsl-sin.c
+++ b/tests/shaders/glsl-sin.c
@@ -109,7 +109,7 @@ enum piglit_result piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-    if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
         printf("Requires OpenGL 2.0\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c
index 18bdad7..1a0a853 100644
--- a/tests/shaders/glsl-uniform-update.c
+++ b/tests/shaders/glsl-uniform-update.c
@@ -73,7 +73,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c
index 93f4129..2a74560 100644
--- a/tests/shaders/glsl-unused-varying.c
+++ b/tests/shaders/glsl-unused-varying.c
@@ -75,7 +75,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-useprogram-displaylist.c b/tests/shaders/glsl-useprogram-displaylist.c
index 616c285..56fb0e9 100644
--- a/tests/shaders/glsl-useprogram-displaylist.c
+++ b/tests/shaders/glsl-useprogram-displaylist.c
@@ -54,7 +54,7 @@ piglit_init(int argc, char **argv)
 	GLint fsg;
 	GLint vs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-arrays.c b/tests/shaders/glsl-vs-arrays.c
index c587e09..972e3a2 100644
--- a/tests/shaders/glsl-vs-arrays.c
+++ b/tests/shaders/glsl-vs-arrays.c
@@ -62,7 +62,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-functions.c b/tests/shaders/glsl-vs-functions.c
index 97a40a5..9941010 100644
--- a/tests/shaders/glsl-vs-functions.c
+++ b/tests/shaders/glsl-vs-functions.c
@@ -64,7 +64,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-if-bool.c b/tests/shaders/glsl-vs-if-bool.c
index 0b512f6..289b04f 100644
--- a/tests/shaders/glsl-vs-if-bool.c
+++ b/tests/shaders/glsl-vs-if-bool.c
@@ -65,7 +65,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-loop-nested.c b/tests/shaders/glsl-vs-loop-nested.c
index 2d59c61..1c557c2 100644
--- a/tests/shaders/glsl-vs-loop-nested.c
+++ b/tests/shaders/glsl-vs-loop-nested.c
@@ -103,7 +103,7 @@ piglit_init(int argc, char **argv)
 	 */
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c
index 67a625e..86ad11b 100644
--- a/tests/shaders/glsl-vs-loop.c
+++ b/tests/shaders/glsl-vs-loop.c
@@ -102,7 +102,7 @@ piglit_init(int argc, char **argv)
 	 */
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-mov-after-deref.c b/tests/shaders/glsl-vs-mov-after-deref.c
index 447b70c..968ce31 100644
--- a/tests/shaders/glsl-vs-mov-after-deref.c
+++ b/tests/shaders/glsl-vs-mov-after-deref.c
@@ -62,7 +62,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-mvp-statechange.c b/tests/shaders/glsl-vs-mvp-statechange.c
index 6f3a7f9..54bc02e 100644
--- a/tests/shaders/glsl-vs-mvp-statechange.c
+++ b/tests/shaders/glsl-vs-mvp-statechange.c
@@ -72,7 +72,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 1.0, 0.0, 0.0);\n"
 		"}\n";
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-normalscale.c b/tests/shaders/glsl-vs-normalscale.c
index 30b0031..d8e1b44 100644
--- a/tests/shaders/glsl-vs-normalscale.c
+++ b/tests/shaders/glsl-vs-normalscale.c
@@ -67,7 +67,7 @@ void piglit_init(int argc, char **argv)
 	GLint vs, fs;
 	int loc;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-point-size.c b/tests/shaders/glsl-vs-point-size.c
index 5b7fc1d..c8d9f06 100644
--- a/tests/shaders/glsl-vs-point-size.c
+++ b/tests/shaders/glsl-vs-point-size.c
@@ -85,7 +85,7 @@ piglit_init(int argc, char **argv)
 	GLint vs;
 	GLint point_size_range[2];
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-raytrace-bug26691.c b/tests/shaders/glsl-vs-raytrace-bug26691.c
index 22fd990..2e919a3 100644
--- a/tests/shaders/glsl-vs-raytrace-bug26691.c
+++ b/tests/shaders/glsl-vs-raytrace-bug26691.c
@@ -271,7 +271,7 @@ piglit_init(int argc, char **argv)
 
   glDisable(GL_DEPTH_TEST);
 
-  if (!GLEW_VERSION_2_0) {
+  if (piglit_get_gl_version() < 20) {
     printf("Requires OpenGL 2.0\n");
     piglit_report_result(PIGLIT_SKIP);
   }
diff --git a/tests/shaders/glsl-vs-sqrt-zero.c b/tests/shaders/glsl-vs-sqrt-zero.c
index 2794c14..85f2efc 100644
--- a/tests/shaders/glsl-vs-sqrt-zero.c
+++ b/tests/shaders/glsl-vs-sqrt-zero.c
@@ -60,7 +60,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-statechange-1.c b/tests/shaders/glsl-vs-statechange-1.c
index 59f5473..599b852 100644
--- a/tests/shaders/glsl-vs-statechange-1.c
+++ b/tests/shaders/glsl-vs-statechange-1.c
@@ -77,7 +77,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-texturematrix-1.c b/tests/shaders/glsl-vs-texturematrix-1.c
index d46c63e..eb30590 100644
--- a/tests/shaders/glsl-vs-texturematrix-1.c
+++ b/tests/shaders/glsl-vs-texturematrix-1.c
@@ -82,7 +82,7 @@ void piglit_init(int argc, char **argv)
 	GLint vs, fs;
 	int loc;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-texturematrix-2.c b/tests/shaders/glsl-vs-texturematrix-2.c
index 1efe261..56b734b 100644
--- a/tests/shaders/glsl-vs-texturematrix-2.c
+++ b/tests/shaders/glsl-vs-texturematrix-2.c
@@ -84,7 +84,7 @@ void piglit_init(int argc, char **argv)
 	GLint vs, fs;
 	int loc;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/glsl-vs-user-varying-ff.c b/tests/shaders/glsl-vs-user-varying-ff.c
index 1fdb30d..1448d16 100644
--- a/tests/shaders/glsl-vs-user-varying-ff.c
+++ b/tests/shaders/glsl-vs-user-varying-ff.c
@@ -69,7 +69,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint vs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/link-mismatch-layout-01.c b/tests/shaders/link-mismatch-layout-01.c
index ec0de6d..e1d0f8f 100644
--- a/tests/shaders/link-mismatch-layout-01.c
+++ b/tests/shaders/link-mismatch-layout-01.c
@@ -66,7 +66,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint fs[2];
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/link-mismatch-layout-02.c b/tests/shaders/link-mismatch-layout-02.c
index 063646d..ced3a16 100644
--- a/tests/shaders/link-mismatch-layout-02.c
+++ b/tests/shaders/link-mismatch-layout-02.c
@@ -66,7 +66,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint fs[2];
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/link-mismatch-layout-03.c b/tests/shaders/link-mismatch-layout-03.c
index 77d2c82..ea47ed6 100644
--- a/tests/shaders/link-mismatch-layout-03.c
+++ b/tests/shaders/link-mismatch-layout-03.c
@@ -64,7 +64,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint fs[2];
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/link-unresolved-function.c b/tests/shaders/link-unresolved-function.c
index a255b28..62ffb5d 100644
--- a/tests/shaders/link-unresolved-function.c
+++ b/tests/shaders/link-unresolved-function.c
@@ -49,7 +49,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint vs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/sso-simple.c b/tests/shaders/sso-simple.c
index 99a77f9..aa6397c 100644
--- a/tests/shaders/sso-simple.c
+++ b/tests/shaders/sso-simple.c
@@ -106,7 +106,7 @@ piglit_init(int argc, char **argv)
 	GLuint vs;
 	GLuint fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/sso-uniforms-01.c b/tests/shaders/sso-uniforms-01.c
index 100390b..23c86da 100644
--- a/tests/shaders/sso-uniforms-01.c
+++ b/tests/shaders/sso-uniforms-01.c
@@ -79,7 +79,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint loc;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/sso-uniforms-02.c b/tests/shaders/sso-uniforms-02.c
index d335a22..9157eca 100644
--- a/tests/shaders/sso-uniforms-02.c
+++ b/tests/shaders/sso-uniforms-02.c
@@ -78,7 +78,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint loc;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/sso-user-varying-01.c b/tests/shaders/sso-user-varying-01.c
index 29c355f..c8203e3 100644
--- a/tests/shaders/sso-user-varying-01.c
+++ b/tests/shaders/sso-user-varying-01.c
@@ -84,7 +84,7 @@ piglit_init(int argc, char **argv)
 	GLuint vs;
 	GLuint fs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/sso-user-varying-02.c b/tests/shaders/sso-user-varying-02.c
index abdc90b..d1a9a9d 100644
--- a/tests/shaders/sso-user-varying-02.c
+++ b/tests/shaders/sso-user-varying-02.c
@@ -82,7 +82,7 @@ piglit_init(int argc, char **argv)
 {
 	GLboolean try_to_render;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/trinity-fp1.c b/tests/shaders/trinity-fp1.c
index 88d009d..4180d0c 100644
--- a/tests/shaders/trinity-fp1.c
+++ b/tests/shaders/trinity-fp1.c
@@ -227,7 +227,7 @@ piglit_init(int argc, char **argv)
 
 		"END";
 
-	if (!GLEW_VERSION_1_3) {
+	if (piglit_get_gl_version() < 13) {
 		printf("Requires OpenGL 1.3\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/useprogram-flushverts-1.c b/tests/shaders/useprogram-flushverts-1.c
index b4ed7c7..b7bd0bf 100644
--- a/tests/shaders/useprogram-flushverts-1.c
+++ b/tests/shaders/useprogram-flushverts-1.c
@@ -111,7 +111,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 0.0, 1.0, 0.0);\n"
 		"}\n";
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/useprogram-flushverts-2.c b/tests/shaders/useprogram-flushverts-2.c
index 7ed71af..984b2eb 100644
--- a/tests/shaders/useprogram-flushverts-2.c
+++ b/tests/shaders/useprogram-flushverts-2.c
@@ -117,7 +117,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 0.0, 1.0, 0.0);\n"
 		"}\n";
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/useprogram-inside-begin.c b/tests/shaders/useprogram-inside-begin.c
index f9bc974..ac936fa 100644
--- a/tests/shaders/useprogram-inside-begin.c
+++ b/tests/shaders/useprogram-inside-begin.c
@@ -53,7 +53,7 @@ piglit_init(int argc, char **argv)
 	GLint vs;
 	GLenum err;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/useprogram-refcount-1.c b/tests/shaders/useprogram-refcount-1.c
index a52d1f1..daf96ee 100644
--- a/tests/shaders/useprogram-refcount-1.c
+++ b/tests/shaders/useprogram-refcount-1.c
@@ -80,7 +80,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 1.0, 0.0, 0.0);\n"
 		"}\n";
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/useshaderprogram-bad-program.c b/tests/shaders/useshaderprogram-bad-program.c
index 4318f6b..512c851 100644
--- a/tests/shaders/useshaderprogram-bad-program.c
+++ b/tests/shaders/useshaderprogram-bad-program.c
@@ -54,7 +54,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint vs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/useshaderprogram-bad-type.c b/tests/shaders/useshaderprogram-bad-type.c
index 150406a..55a5af3 100644
--- a/tests/shaders/useshaderprogram-bad-type.c
+++ b/tests/shaders/useshaderprogram-bad-type.c
@@ -79,7 +79,7 @@ piglit_init(int argc, char **argv)
 		? 0 : GL_INVALID_ENUM;
 	GLboolean pass;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/useshaderprogram-flushverts-1.c b/tests/shaders/useshaderprogram-flushverts-1.c
index 99410db..58e418e 100644
--- a/tests/shaders/useshaderprogram-flushverts-1.c
+++ b/tests/shaders/useshaderprogram-flushverts-1.c
@@ -113,7 +113,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 0.0, 1.0, 0.0);\n"
 		"}\n";
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/vp-ignore-input.c b/tests/shaders/vp-ignore-input.c
index d32e25a..2e0caa0 100644
--- a/tests/shaders/vp-ignore-input.c
+++ b/tests/shaders/vp-ignore-input.c
@@ -71,7 +71,7 @@ piglit_init(int argc, char **argv)
 
 	glClearColor(0.2, 0.2, 0.2, 1.0);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/shaders/vpfp-generic.cpp b/tests/shaders/vpfp-generic.cpp
index 8979d42..58404d4 100644
--- a/tests/shaders/vpfp-generic.cpp
+++ b/tests/shaders/vpfp-generic.cpp
@@ -403,7 +403,7 @@ extern "C" void piglit_init(int argc, char **argv)
 
 	fp = tests.fragment_program_code.c_str();
 
-	if (!GLEW_VERSION_1_3) {
+	if (piglit_get_gl_version() < 13) {
 		printf("Requires OpenGL 1.3\n");
 		piglit_report_result(PIGLIT_SKIP);
 		exit(1);
diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
index 8781324..04c4a11 100644
--- a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
+++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
@@ -69,7 +69,7 @@ do_copy()
 void
 piglit_init(int argc, char *argv[])
 {
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		printf("Requires OpenGL 1.5\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c
index 6f3ff99..5128565 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c
@@ -81,7 +81,7 @@ piglit_init(int argc, char **argv)
 	GLuint vs, prog;
 	int i,j;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c
index c095906..5993951 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c
@@ -69,7 +69,7 @@ piglit_init(int argc, char **argv)
 		{ GL_HIGH_INT,     { 16, 16 },  0 }
 	};
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
index 1dfeb06..7a1b3d8 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
@@ -44,7 +44,7 @@ piglit_init(int argc, char **argv)
 	GLboolean pass = GL_TRUE;
 	GLint floats, vecs;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
index eca6b9b..05f5f74 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
@@ -121,7 +121,7 @@ piglit_init(int argc, char **argv)
 		+0.0, -1.0, 0.0, 1.0,
 	};
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
index c7febf8..7fd5d2b 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
@@ -44,7 +44,7 @@ piglit_init(int argc, char **argv)
 #ifdef GL_ARB_ES2_compatibility
 	GLint shadercompiler;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c
index 3b529fc..6004bd9 100644
--- a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c
+++ b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c
@@ -45,7 +45,7 @@ piglit_init(int argc, char *argv[])
 	GLbitfield access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
 	GLuint buffer;
 
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		printf("Requires OpenGL 1.5\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c
index db78241..d5a1da5 100644
--- a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c
+++ b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c
@@ -61,7 +61,7 @@ piglit_init(int argc, char *argv[])
 	int i;
 	bool ret;
 
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		printf("Requires OpenGL 1.5\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/arb_robustness/draw-vbo-bounds.c b/tests/spec/arb_robustness/draw-vbo-bounds.c
index 5d1bab2..d5753c6 100644
--- a/tests/spec/arb_robustness/draw-vbo-bounds.c
+++ b/tests/spec/arb_robustness/draw-vbo-bounds.c
@@ -54,7 +54,7 @@ void piglit_init(int argc, char **argv)
 {
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (!GLEW_VERSION_1_5) {
+    if (piglit_get_gl_version() < 15) {
         printf("Requires OpenGL 1.5\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/spec/arb_transform_feedback2/draw-auto.c b/tests/spec/arb_transform_feedback2/draw-auto.c
index 350af30..597f3a1 100644
--- a/tests/spec/arb_transform_feedback2/draw-auto.c
+++ b/tests/spec/arb_transform_feedback2/draw-auto.c
@@ -59,7 +59,7 @@ void piglit_init(int argc, char **argv)
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
 	/* Check the driver. */
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		fprintf(stderr, "OpenGL 1.5 required.\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c
index 88517a4..f4dec02 100644
--- a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c
+++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c
@@ -51,7 +51,7 @@ void piglit_init(int argc, char **argv)
 {
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (!GLEW_VERSION_1_5) {
+    if (piglit_get_gl_version() < 15) {
         printf("Requires OpenGL 1.5\n");
         piglit_report_result(PIGLIT_SKIP);
     }
diff --git a/tests/spec/ext_timer_query/time-elapsed.c b/tests/spec/ext_timer_query/time-elapsed.c
index c172ac2..0c6aa10 100644
--- a/tests/spec/ext_timer_query/time-elapsed.c
+++ b/tests/spec/ext_timer_query/time-elapsed.c
@@ -245,7 +245,7 @@ retry:
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/ext_transform_feedback/interleaved.c b/tests/spec/ext_transform_feedback/interleaved.c
index 3f84d36..63087c9 100644
--- a/tests/spec/ext_transform_feedback/interleaved.c
+++ b/tests/spec/ext_transform_feedback/interleaved.c
@@ -61,7 +61,7 @@ void piglit_init(int argc, char **argv)
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
 	/* Check the driver. */
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		fprintf(stderr, "OpenGL 1.5 required.\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/ext_transform_feedback/output-type.c b/tests/spec/ext_transform_feedback/output-type.c
index 450a297..7b73c27 100644
--- a/tests/spec/ext_transform_feedback/output-type.c
+++ b/tests/spec/ext_transform_feedback/output-type.c
@@ -1246,7 +1246,7 @@ test_ready:
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
 	/* Check the driver. */
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		fprintf(stderr, "OpenGL 1.5 required.\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/ext_transform_feedback/position.c b/tests/spec/ext_transform_feedback/position.c
index 51dfc58..fb4bf99 100644
--- a/tests/spec/ext_transform_feedback/position.c
+++ b/tests/spec/ext_transform_feedback/position.c
@@ -99,7 +99,7 @@ void piglit_init(int argc, char **argv)
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
 	/* Check the driver. */
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		fprintf(stderr, "OpenGL 1.5 required.\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/ext_transform_feedback/separate.c b/tests/spec/ext_transform_feedback/separate.c
index da5beba..14a5d33 100644
--- a/tests/spec/ext_transform_feedback/separate.c
+++ b/tests/spec/ext_transform_feedback/separate.c
@@ -61,7 +61,7 @@ void piglit_init(int argc, char **argv)
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
 	/* Check the driver. */
-	if (!GLEW_VERSION_1_5) {
+	if (piglit_get_gl_version() < 15) {
 		fprintf(stderr, "OpenGL 1.5 required.\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
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 500ea7c..83ede0a 100644
--- a/tests/spec/gl-2.0/vertex-program-two-side.c
+++ b/tests/spec/gl-2.0/vertex-program-two-side.c
@@ -150,7 +150,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_GLSL();
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c
index c18e9d9..9010e8b 100644
--- a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c
+++ b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c
@@ -50,7 +50,7 @@ piglit_init(int argc, char **argv)
 	GLuint rb, fbo;
 	int i;
 
-	if (!GLEW_VERSION_3_0) {
+	if (piglit_get_gl_version() < 30) {
 		printf("Requires GL 3.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/gl-3.0/required-sized-texture-formats.c b/tests/spec/gl-3.0/required-sized-texture-formats.c
index 0780a46..d00b640 100644
--- a/tests/spec/gl-3.0/required-sized-texture-formats.c
+++ b/tests/spec/gl-3.0/required-sized-texture-formats.c
@@ -77,7 +77,7 @@ piglit_init(int argc, char **argv)
 	GLuint tex;
 	int i, c;
 
-	if (!GLEW_VERSION_3_0) {
+	if (piglit_get_gl_version() < 30) {
 		printf("Requires GL 3.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/gl-3.0/required-texture-attachment-formats.c b/tests/spec/gl-3.0/required-texture-attachment-formats.c
index b8de859..310fc5e 100644
--- a/tests/spec/gl-3.0/required-texture-attachment-formats.c
+++ b/tests/spec/gl-3.0/required-texture-attachment-formats.c
@@ -50,7 +50,7 @@ piglit_init(int argc, char **argv)
 	GLuint tex, fbo;
 	int i, c;
 
-	if (!GLEW_VERSION_3_0) {
+	if (piglit_get_gl_version() < 30) {
 		printf("Requires GL 3.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/begin-while-active.c b/tests/spec/nv_conditional_render/begin-while-active.c
index 689aecb..b5565f5 100644
--- a/tests/spec/nv_conditional_render/begin-while-active.c
+++ b/tests/spec/nv_conditional_render/begin-while-active.c
@@ -55,7 +55,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint q;
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/begin-zero.c b/tests/spec/nv_conditional_render/begin-zero.c
index 8218a1d..cbe8f2d 100644
--- a/tests/spec/nv_conditional_render/begin-zero.c
+++ b/tests/spec/nv_conditional_render/begin-zero.c
@@ -53,7 +53,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/bitmap.c b/tests/spec/nv_conditional_render/bitmap.c
index ca05aae..9c5efbe 100644
--- a/tests/spec/nv_conditional_render/bitmap.c
+++ b/tests/spec/nv_conditional_render/bitmap.c
@@ -98,7 +98,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c
index 1c3feea..61e72aa 100644
--- a/tests/spec/nv_conditional_render/blitframebuffer.c
+++ b/tests/spec/nv_conditional_render/blitframebuffer.c
@@ -130,7 +130,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c
index f2800ac..bec80f4 100644
--- a/tests/spec/nv_conditional_render/clear.c
+++ b/tests/spec/nv_conditional_render/clear.c
@@ -91,7 +91,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c
index 93893b9..348fd2a 100644
--- a/tests/spec/nv_conditional_render/copypixels.c
+++ b/tests/spec/nv_conditional_render/copypixels.c
@@ -94,7 +94,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/copyteximage.c b/tests/spec/nv_conditional_render/copyteximage.c
index 92188b3..67234de 100644
--- a/tests/spec/nv_conditional_render/copyteximage.c
+++ b/tests/spec/nv_conditional_render/copyteximage.c
@@ -115,7 +115,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c
index db21776..3ae84e7 100644
--- a/tests/spec/nv_conditional_render/copytexsubimage.c
+++ b/tests/spec/nv_conditional_render/copytexsubimage.c
@@ -115,7 +115,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/dlist.c
index b640f35..afc89e7 100644
--- a/tests/spec/nv_conditional_render/dlist.c
+++ b/tests/spec/nv_conditional_render/dlist.c
@@ -86,7 +86,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/drawpixels.c b/tests/spec/nv_conditional_render/drawpixels.c
index 5e14661..c65e65c 100644
--- a/tests/spec/nv_conditional_render/drawpixels.c
+++ b/tests/spec/nv_conditional_render/drawpixels.c
@@ -108,7 +108,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/generatemipmap.c b/tests/spec/nv_conditional_render/generatemipmap.c
index 4496f92..7fb332f 100644
--- a/tests/spec/nv_conditional_render/generatemipmap.c
+++ b/tests/spec/nv_conditional_render/generatemipmap.c
@@ -114,7 +114,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/spec/nv_conditional_render/vertex_array.c b/tests/spec/nv_conditional_render/vertex_array.c
index 4de7fa6..c7ce6ea 100644
--- a/tests/spec/nv_conditional_render/vertex_array.c
+++ b/tests/spec/nv_conditional_render/vertex_array.c
@@ -91,7 +91,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/texturing/depth-tex-modes-glsl.c b/tests/texturing/depth-tex-modes-glsl.c
index c57bdb5..65c413e 100644
--- a/tests/texturing/depth-tex-modes-glsl.c
+++ b/tests/texturing/depth-tex-modes-glsl.c
@@ -80,7 +80,7 @@ static void loadTex(void);
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/texturing/fragment-and-vertex-texturing.c b/tests/texturing/fragment-and-vertex-texturing.c
index 4355df7..211b5ef 100644
--- a/tests/texturing/fragment-and-vertex-texturing.c
+++ b/tests/texturing/fragment-and-vertex-texturing.c
@@ -178,7 +178,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (!GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() < 20) {
 		printf("Requires OpenGL 2.0\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/texturing/gen-nonzero-unit.c b/tests/texturing/gen-nonzero-unit.c
index c9d046c..b60073d 100644
--- a/tests/texturing/gen-nonzero-unit.c
+++ b/tests/texturing/gen-nonzero-unit.c
@@ -173,7 +173,7 @@ piglit_init(int argc, char **argv)
 {
 	piglit_require_extension("GL_SGIS_generate_mipmap");
 
-	if (GLEW_VERSION_1_3) {
+	if (piglit_get_gl_version() >= 13) {
 		ActiveTexture = GLEW_GET_FUN(__glewActiveTexture);
 	} else {
 		piglit_require_extension("GL_ARB_multitexture");
diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c
index 641f6d8..4a49e9e 100644
--- a/tests/texturing/lodbias.c
+++ b/tests/texturing/lodbias.c
@@ -295,7 +295,7 @@ piglit_init(int argc, char **argv)
 {
 	int i;
 
-	if (!GLEW_VERSION_1_3) {
+	if (piglit_get_gl_version() < 13) {
 		printf("Requires OpenGL 1.3\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c
index 1b252e7..c065836 100644
--- a/tests/texturing/tex-miplevel-selection.c
+++ b/tests/texturing/tex-miplevel-selection.c
@@ -79,7 +79,7 @@ piglit_init(int argc, char **argv)
         }
 
 	piglit_require_extension("GL_EXT_framebuffer_object");
-	if (!GLEW_VERSION_1_4)
+	if (piglit_get_gl_version() < 14)
 		piglit_report_result(PIGLIT_SKIP);
 
 	if (ARB_shader_texture_lod) {
diff --git a/tests/texturing/tex-skipped-unit.c b/tests/texturing/tex-skipped-unit.c
index 6c964aa..31d6c1e 100644
--- a/tests/texturing/tex-skipped-unit.c
+++ b/tests/texturing/tex-skipped-unit.c
@@ -129,7 +129,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_1_2) {
+	if (piglit_get_gl_version() < 12) {
 		piglit_report_result(PIGLIT_SKIP);
 	}
 }
diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c
index 4d10d09..388fe05 100644
--- a/tests/texturing/tex3d-maxsize.c
+++ b/tests/texturing/tex3d-maxsize.c
@@ -202,7 +202,7 @@ static void Reshape(int width, int height)
 
 void piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_1_2) {
+	if (piglit_get_gl_version() < 12) {
 		printf("Requires OpenGL 1.2\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c
index 5246b3f..42c24a0 100644
--- a/tests/texturing/tex3d.c
+++ b/tests/texturing/tex3d.c
@@ -223,7 +223,7 @@ static void Reshape(int width, int height)
 void
 piglit_init(int argc, char **argv)
 {
-	if (!GLEW_VERSION_1_2) {
+	if (piglit_get_gl_version() < 12) {
 		printf("Requires OpenGL 1.2\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c
index d45d8d8..06c7a96 100644
--- a/tests/texturing/texrect-many.c
+++ b/tests/texturing/texrect-many.c
@@ -114,7 +114,7 @@ void piglit_init(int argc, char **argv)
 	int i;
 	int maxtextures;
 
-	if (!GLEW_VERSION_1_3) {
+	if (piglit_get_gl_version() < 13) {
 		printf("Requires OpenGL 1.3\n");
 		piglit_report_result(PIGLIT_SKIP);
 	}
diff --git a/tests/util/piglit-framework.c b/tests/util/piglit-framework.c
index 9f20906..dac04b7 100644
--- a/tests/util/piglit-framework.c
+++ b/tests/util/piglit-framework.c
@@ -166,7 +166,7 @@ piglit_framework_fbo_init()
 #ifdef USE_OPENGL
 	glewInit();
 
-	if (!GLEW_VERSION_2_0)
+	if (piglit_get_gl_version() < 20)
 		return false;
 #endif
 
diff --git a/tests/util/piglit-shader-gl.c b/tests/util/piglit-shader-gl.c
index 352ac8f..db41a58 100644
--- a/tests/util/piglit-shader-gl.c
+++ b/tests/util/piglit-shader-gl.c
@@ -193,7 +193,7 @@ init_functions_from_extension(void)
 void
 piglit_require_GLSL(void)
 {
-	if (GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() >= 20) {
 		init_functions_from_core();
 	} else if (GLEW_ARB_shader_objects && GLEW_ARB_shading_language_100) {
 		init_functions_from_extension();
@@ -225,7 +225,7 @@ piglit_require_GLSL_version(int version)
 void
 piglit_require_vertex_shader(void)
 {
-	if (GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() >= 20) {
 		init_functions_from_core();
 	} else if (GLEW_ARB_shader_objects && GLEW_ARB_vertex_shader) {
 		init_functions_from_extension();
@@ -239,7 +239,7 @@ piglit_require_vertex_shader(void)
 void
 piglit_require_fragment_shader(void)
 {
-	if (GLEW_VERSION_2_0) {
+	if (piglit_get_gl_version() >= 20) {
 		init_functions_from_core();
 	} else if (GLEW_ARB_shader_objects && GLEW_ARB_fragment_shader) {
 		init_functions_from_extension();
diff --git a/tests/util/piglit-transform-feedback.c b/tests/util/piglit-transform-feedback.c
index a200d49..ba88c5b 100644
--- a/tests/util/piglit-transform-feedback.c
+++ b/tests/util/piglit-transform-feedback.c
@@ -69,7 +69,7 @@ init_functions_from_ext(void)
 void
 piglit_require_transform_feedback(void)
 {
-	if (GLEW_VERSION_3_0) {
+	if (piglit_get_gl_version() >= 30) {
 		init_functions_from_core();
 	} else if (GLEW_EXT_transform_feedback) {
 		init_functions_from_ext();
-- 
1.7.7.6



More information about the Piglit mailing list