util,tests: Replace GLUT visual enums with PIGLTI_GL_VISUAL enums (v2)

I'm trying to transition Piglit from using GLUT to using Waffle. That
requires either killing or wrapping all GLUT code.

Define enum piglit_gl_visual in piglit-framework.h, of which each value
matches its corresponding GLUT visual enum.

Do the following substitution in all util and test sources:
    GLUT_RGB            -> PIGLIT_GL_VISUAL_RGB
    GLUT_RGBA           -> PIGLIT_GL_VISUAL_RGBA
    GLUT_DOUBLE         -> PIGLIT_GL_VISUAL_DOUBLE
    GLUT_ACCUM          -> PIGLIT_GL_VISUAL_ACCUM
    GLUT_ALPHA          -> PIGLIT_GL_VISUAL_ALPHA
    GLUT_DEPTH          -> PIGLIT_GL_VISUAL_DEPTH
    GLUT_STENCIL        -> PIGLIT_GL_VISUAL_STENCIL

v2: Remove GLUT_INDEX, for Ken.

Reviewed-and-tested-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

101 files changed, 101 insertions, 101 deletions

diff --git a/tests/general/array-stride.c b/tests/general/array-stride.c
index 297a5567..2d4ff833 100644
--- a/tests/general/array-stride.c
+++ b/tests/general/array-stride.c
@@ -33,7 +33,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const char *TestName = "array-stride";
 
diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c
index 7b3821cf..25b12568 100644
--- a/tests/general/bgra-sec-color-pointer.c
+++ b/tests/general/bgra-sec-color-pointer.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLfloat verts[12] = {225.0, 175.0, 0.0,
 				225.0, 225.0, 0.0,
diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c
index 54048763..b504e6e6 100644
--- a/tests/general/bgra-vert-attrib-pointer.c
+++ b/tests/general/bgra-vert-attrib-pointer.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLint prog;
 static GLint fs;
diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c
index 9f698805..fc703f2c 100644
--- a/tests/general/blendminmax.c
+++ b/tests/general/blendminmax.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     200 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const GLfloat Near = 5.0, Far = 25.0;
 
diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c
index 98b64570..5dd324f3 100644
--- a/tests/general/blendsquare.c
+++ b/tests/general/blendsquare.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     200 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const GLfloat Near = 5.0, Far = 25.0;
 
diff --git a/tests/general/clear-accum.c b/tests/general/clear-accum.c
index 58ebfba6..22474b17 100644
--- a/tests/general/clear-accum.c
+++ b/tests/general/clear-accum.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     200 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_ACCUM)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ACCUM)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c
index e13b29ce..221e3af7 100644
--- a/tests/general/clear-varray-2.0.c
+++ b/tests/general/clear-varray-2.0.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     200 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH)
 
 /* apply MVP and set the color to blue. */
 static const GLchar *const vp_code =
diff --git a/tests/general/copy-pixels.c b/tests/general/copy-pixels.c
index 20767f92..9cce238c 100644
--- a/tests/general/copy-pixels.c
+++ b/tests/general/copy-pixels.c
@@ -38,7 +38,7 @@
 PIGLIT_GL_TEST_MAIN(
     32 /*window_width*/,
     32 /*window_height*/,
-    GLUT_RGBA | GLUT_DOUBLE | GLUT_ALPHA | GLUT_STENCIL | GLUT_DEPTH);
+    PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_STENCIL | PIGLIT_GL_VISUAL_DEPTH);
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/copypixels-draw-sync.c b/tests/general/copypixels-draw-sync.c
index 9b309754..3152b6df 100644
--- a/tests/general/copypixels-draw-sync.c
+++ b/tests/general/copypixels-draw-sync.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     64 /*window_width*/,
     64 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/copypixels-sync.c b/tests/general/copypixels-sync.c
index 8feab923..8861eda7 100644
--- a/tests/general/copypixels-sync.c
+++ b/tests/general/copypixels-sync.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     64 /*window_width*/,
     64 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/depth-clamp-range.c b/tests/general/depth-clamp-range.c
index a080e146..0cf027b4 100644
--- a/tests/general/depth-clamp-range.c
+++ b/tests/general/depth-clamp-range.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     150 /*window_width*/,
     150 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/depth_clamp.c b/tests/general/depth_clamp.c
index caa5e2b6..66200063 100644
--- a/tests/general/depth_clamp.c
+++ b/tests/general/depth_clamp.c
@@ -39,7 +39,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     150 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c
index 10ccac00..0c3c3551 100644
--- a/tests/general/depthfunc.c
+++ b/tests/general/depthfunc.c
@@ -36,7 +36,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     200 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH)
 
 /**
  * Convenience function to draw an axis-aligned rectangle.
diff --git a/tests/general/depthrange-clear.c b/tests/general/depthrange-clear.c
index 45c92e1e..0f460348 100644
--- a/tests/general/depthrange-clear.c
+++ b/tests/general/depthrange-clear.c
@@ -36,7 +36,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH)
 
 /**
  * Convenience function to draw an axis-aligned rectangle.
diff --git a/tests/general/dlist-clear.c b/tests/general/dlist-clear.c
index fd45141e..8f33ee45 100644
--- a/tests/general/dlist-clear.c
+++ b/tests/general/dlist-clear.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/dlist-color-material.c b/tests/general/dlist-color-material.c
index ae2bceef..bcb37e0f 100644
--- a/tests/general/dlist-color-material.c
+++ b/tests/general/dlist-color-material.c
@@ -38,7 +38,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_DOUBLE)
 
 /**
  * Test glMaterial handling in a display list for one of GL_AMBIENT,
diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c
index dabe7c31..7a2c24b9 100644
--- a/tests/general/dlist-fdo3129-01.c
+++ b/tests/general/dlist-fdo3129-01.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
     256 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLuint list;
 
diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c
index 87752b23..3ad10ced 100644
--- a/tests/general/dlist-fdo3129-02.c
+++ b/tests/general/dlist-fdo3129-02.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
     256 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLuint list;
 
diff --git a/tests/general/dlist-fdo31590.c b/tests/general/dlist-fdo31590.c
index 536cf393..5556564d 100644
--- a/tests/general/dlist-fdo31590.c
+++ b/tests/general/dlist-fdo31590.c
@@ -41,7 +41,7 @@ static const char *TestName = "dlist-fdo31590";
 PIGLIT_GL_TEST_MAIN(
     500 /*window_width*/,
     500 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const GLfloat ctrlpoints[4][3] = {
    { -4.0, -4.0, 0.0}, { -2.0, 4.0, 0.0}, 
diff --git a/tests/general/draw-arrays-colormaterial.c b/tests/general/draw-arrays-colormaterial.c
index acca789a..2fc9431e 100644
--- a/tests/general/draw-arrays-colormaterial.c
+++ b/tests/general/draw-arrays-colormaterial.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGBA | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 #define DX0 -0.6
 
diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c
index 6c9b105a..e311f8e3 100644
--- a/tests/general/draw-batch.c
+++ b/tests/general/draw-batch.c
@@ -27,7 +27,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     130 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/draw-copypixels-sync.c b/tests/general/draw-copypixels-sync.c
index b7329a33..a526687a 100644
--- a/tests/general/draw-copypixels-sync.c
+++ b/tests/general/draw-copypixels-sync.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     64 /*window_width*/,
     64 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/draw-elements-base-vertex-bounds.c b/tests/general/draw-elements-base-vertex-bounds.c
index 09ca577c..03791c34 100644
--- a/tests/general/draw-elements-base-vertex-bounds.c
+++ b/tests/general/draw-elements-base-vertex-bounds.c
@@ -38,7 +38,7 @@
 PIGLIT_GL_TEST_MAIN(
     300 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLfloat vertices[][4] = {
 	{  1, -1, 0, 1 }, /* bottom right */
diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c
index ebb72fc4..ff4c97fc 100644
--- a/tests/general/draw-elements-base-vertex-neg.c
+++ b/tests/general/draw-elements-base-vertex-neg.c
@@ -29,7 +29,7 @@
 PIGLIT_GL_TEST_MAIN(
     320 /*window_width*/,
     80 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 GLboolean user_va = GL_FALSE;
 
diff --git a/tests/general/draw-elements-base-vertex.c b/tests/general/draw-elements-base-vertex.c
index 3b4e7328..99f8791b 100644
--- a/tests/general/draw-elements-base-vertex.c
+++ b/tests/general/draw-elements-base-vertex.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     300 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 #define NUM_QUADS  10
 
diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c
index 4c73fff4..acdcd2b8 100644
--- a/tests/general/draw-elements-vs-inputs.c
+++ b/tests/general/draw-elements-vs-inputs.c
@@ -42,7 +42,7 @@
 PIGLIT_GL_TEST_MAIN(
     300 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c
index 32cdf921..c17f9dea 100644
--- a/tests/general/draw-elements.c
+++ b/tests/general/draw-elements.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     320 /*window_width*/,
     60 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 GLboolean user = GL_FALSE;
 
diff --git a/tests/general/draw-instanced-divisor.c b/tests/general/draw-instanced-divisor.c
index cac9fd71..731a24e9 100644
--- a/tests/general/draw-instanced-divisor.c
+++ b/tests/general/draw-instanced-divisor.c
@@ -32,7 +32,7 @@
 PIGLIT_GL_TEST_MAIN(
     500 /*window_width*/,
     500 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const char *TestName = "draw-instanced";
 
diff --git a/tests/general/draw-instanced.c b/tests/general/draw-instanced.c
index 6a61f69b..e3906700 100644
--- a/tests/general/draw-instanced.c
+++ b/tests/general/draw-instanced.c
@@ -32,7 +32,7 @@
 PIGLIT_GL_TEST_MAIN(
     500 /*window_width*/,
     500 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const char *TestName = "draw-instanced";
 
diff --git a/tests/general/draw-pixel-with-texture.c b/tests/general/draw-pixel-with-texture.c
index c5951716..7437de79 100644
--- a/tests/general/draw-pixel-with-texture.c
+++ b/tests/general/draw-pixel-with-texture.c
@@ -26,7 +26,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 #define SCREEN_SIZE_IN_PIXELS	(piglit_width * piglit_height * 4)
 
diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c
index 6ee31295..ffc8813c 100644
--- a/tests/general/draw-pixels.c
+++ b/tests/general/draw-pixels.c
@@ -54,7 +54,7 @@
 PIGLIT_GL_TEST_MAIN(
     16 /*window_width*/,
     16 /*window_height*/,
-    GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 const GLuint idx0 = 0, idx1 = 1, idx2 = 2, idx3 = 3;
 static GLfloat expected[100][4];
diff --git a/tests/general/draw-sync.c b/tests/general/draw-sync.c
index 262f505e..c9cc433d 100644
--- a/tests/general/draw-sync.c
+++ b/tests/general/draw-sync.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     64 /*window_width*/,
     64 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c
index c962ebf1..4a4a8831 100644
--- a/tests/general/draw-vertices-half-float.c
+++ b/tests/general/draw-vertices-half-float.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     320 /*window_width*/,
     60 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 GLboolean user_va = GL_FALSE;
 
diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c
index 70f1bd7f..63b4ad89 100644
--- a/tests/general/draw-vertices.c
+++ b/tests/general/draw-vertices.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     320 /*window_width*/,
     60 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 GLboolean user_va = GL_FALSE;
 
diff --git a/tests/general/drawpix-z.c b/tests/general/drawpix-z.c
index 53ec6b2a..64686815 100644
--- a/tests/general/drawpix-z.c
+++ b/tests/general/drawpix-z.c
@@ -38,7 +38,7 @@
 
 PIGLIT_GL_TEST_MAIN(200 /*window_width*/,
                     200 /*window_height*/,
-                    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
+                    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH);
 
 static void
 draw_z_gradient(GLfloat zLeft, GLfloat zRight)
diff --git a/tests/general/early-z.c b/tests/general/early-z.c
index 99578968..fa269629 100644
--- a/tests/general/early-z.c
+++ b/tests/general/early-z.c
@@ -32,7 +32,7 @@
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
     128 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE | GLUT_DEPTH)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH)
 
 GLint u_zval;
 
diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c
index 50fb0ed8..2982a1b0 100644
--- a/tests/general/fog-modes.c
+++ b/tests/general/fog-modes.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/fragment-center.c b/tests/general/fragment-center.c
index 924439e5..14ed623b 100644
--- a/tests/general/fragment-center.c
+++ b/tests/general/fragment-center.c
@@ -26,7 +26,7 @@
 PIGLIT_GL_TEST_MAIN(
     96 /*window_width*/,
     96 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/framebuffer-srgb.c b/tests/general/framebuffer-srgb.c
index 96984b2f..a776f7b6 100644
--- a/tests/general/framebuffer-srgb.c
+++ b/tests/general/framebuffer-srgb.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
     128 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 /* size of texture/renderbuffer (power of two) */
 #define FBO_SIZE 128
diff --git a/tests/general/getactiveattrib.c b/tests/general/getactiveattrib.c
index 2867d43e..7a994f55 100644
--- a/tests/general/getactiveattrib.c
+++ b/tests/general/getactiveattrib.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 struct attribute {
 	/** Name of the attribute. */
diff --git a/tests/general/geterror-inside-begin.c b/tests/general/geterror-inside-begin.c
index bec42212..a55cc4c6 100644
--- a/tests/general/geterror-inside-begin.c
+++ b/tests/general/geterror-inside-begin.c
@@ -38,7 +38,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/geterror-invalid-enum.c b/tests/general/geterror-invalid-enum.c
index 82c2aae6..76b14ef9 100644
--- a/tests/general/geterror-invalid-enum.c
+++ b/tests/general/geterror-invalid-enum.c
@@ -25,7 +25,7 @@
 PIGLIT_GL_TEST_MAIN(
     10 /*window_width*/,
     10 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/gl30basic.c b/tests/general/gl30basic.c
index b5831194..3a7f94df 100644
--- a/tests/general/gl30basic.c
+++ b/tests/general/gl30basic.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 static const char *Prog = "gl30basic";
 
diff --git a/tests/general/hiz.c b/tests/general/hiz.c
index 508433eb..892aa6e4 100644
--- a/tests/general/hiz.c
+++ b/tests/general/hiz.c
@@ -36,7 +36,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     400 /*window_height*/,
-    GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum {
 	INSIDE,
diff --git a/tests/general/infinite-spot-light.c b/tests/general/infinite-spot-light.c
index 485c66cf..f2855d5b 100644
--- a/tests/general/infinite-spot-light.c
+++ b/tests/general/infinite-spot-light.c
@@ -44,7 +44,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 /* Already normalized, and 0.5 would be the expected color */
 static GLfloat dir[3] = {0.866025404, 0.0, 0.5};
diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c
index be2a0900..d8d0bceb 100644
--- a/tests/general/isbufferobj.c
+++ b/tests/general/isbufferobj.c
@@ -38,7 +38,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB)
+    PIGLIT_GL_VISUAL_RGB)
 
 static const char *TestName = "isbufferobj";
 
diff --git a/tests/general/line-aa-width.c b/tests/general/line-aa-width.c
index 8b47e10b..f1523c4b 100644
--- a/tests/general/line-aa-width.c
+++ b/tests/general/line-aa-width.c
@@ -41,7 +41,7 @@
 PIGLIT_GL_TEST_MAIN(
     300 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static float
 y_from_x(float x)
diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c
index ec4f6e38..08910e32 100644
--- a/tests/general/linestipple.c
+++ b/tests/general/linestipple.c
@@ -31,7 +31,7 @@
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
     128 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static void probe_pixel(int x, int y, const float* expected)
 {
diff --git a/tests/general/longprim.c b/tests/general/longprim.c
index fd45905c..752335d9 100644
--- a/tests/general/longprim.c
+++ b/tests/general/longprim.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const char *TestName = "longprim";
 
diff --git a/tests/general/object_purgeable-api-pbo.c b/tests/general/object_purgeable-api-pbo.c
index 4132c595..94e10132 100644
--- a/tests/general/object_purgeable-api-pbo.c
+++ b/tests/general/object_purgeable-api-pbo.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB)
+    PIGLIT_GL_VISUAL_RGB)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/object_purgeable-api-texture.c b/tests/general/object_purgeable-api-texture.c
index 52dcc5d3..0bb3b0a3 100644
--- a/tests/general/object_purgeable-api-texture.c
+++ b/tests/general/object_purgeable-api-texture.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB)
+    PIGLIT_GL_VISUAL_RGB)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/object_purgeable-api-vbo.c b/tests/general/object_purgeable-api-vbo.c
index 12d719f8..18bb5a63 100644
--- a/tests/general/object_purgeable-api-vbo.c
+++ b/tests/general/object_purgeable-api-vbo.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB)
+    PIGLIT_GL_VISUAL_RGB)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c
index 144f70bc..d2418ac9 100644
--- a/tests/general/occlusion-query-discard.c
+++ b/tests/general/occlusion-query-discard.c
@@ -36,7 +36,7 @@
 PIGLIT_GL_TEST_MAIN(
     50 /*window_width*/,
     50 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 static char vs_code[] =
 	"varying float do_discard;\n"
diff --git a/tests/general/occlusion_query.c b/tests/general/occlusion_query.c
index 00bb834e..290fd99a 100644
--- a/tests/general/occlusion_query.c
+++ b/tests/general/occlusion_query.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     180 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH)
 
 #define MAX_QUERIES 5
 static GLuint occ_queries[MAX_QUERIES];
diff --git a/tests/general/oes-read-format.c b/tests/general/oes-read-format.c
index b103d0b5..4a6306c7 100644
--- a/tests/general/oes-read-format.c
+++ b/tests/general/oes-read-format.c
@@ -36,7 +36,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/pbo-drawpixels.c b/tests/general/pbo-drawpixels.c
index a553203c..f4cee90c 100644
--- a/tests/general/pbo-drawpixels.c
+++ b/tests/general/pbo-drawpixels.c
@@ -36,7 +36,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/pbo-read-argb8888.c b/tests/general/pbo-read-argb8888.c
index 46e3521a..f4886cfe 100644
--- a/tests/general/pbo-read-argb8888.c
+++ b/tests/general/pbo-read-argb8888.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLboolean
 probe(int x, int y, uint32_t expected, uint32_t observed)
diff --git a/tests/general/pbo-readpixels-small.c b/tests/general/pbo-readpixels-small.c
index 1fa11537..ea984d1b 100644
--- a/tests/general/pbo-readpixels-small.c
+++ b/tests/general/pbo-readpixels-small.c
@@ -41,7 +41,7 @@
 PIGLIT_GL_TEST_MAIN(
     2 /*window_width*/,
     2 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLboolean
 probe(int x, int y, uint32_t expected, uint32_t observed)
diff --git a/tests/general/pbo-teximage-tiling-2.c b/tests/general/pbo-teximage-tiling-2.c
index c9cc82b4..665a74f2 100644
--- a/tests/general/pbo-teximage-tiling-2.c
+++ b/tests/general/pbo-teximage-tiling-2.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/pbo-teximage-tiling.c b/tests/general/pbo-teximage-tiling.c
index f746f942..8965ff02 100644
--- a/tests/general/pbo-teximage-tiling.c
+++ b/tests/general/pbo-teximage-tiling.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/pbo-teximage.c b/tests/general/pbo-teximage.c
index f1134f52..3b1444a2 100644
--- a/tests/general/pbo-teximage.c
+++ b/tests/general/pbo-teximage.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/point-line-no-cull.c b/tests/general/point-line-no-cull.c
index e6ed739d..dbe7d602 100644
--- a/tests/general/point-line-no-cull.c
+++ b/tests/general/point-line-no-cull.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     120 /*window_width*/,
     120 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 /** Test if the pixels at (x,y) and (x,y+1) are black.
  * We test two pixels to be sure we hit the primitive we drew.  We could
diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c
index 81d8956f..047a2ddb 100644
--- a/tests/general/polygon-mode.c
+++ b/tests/general/polygon-mode.c
@@ -33,7 +33,7 @@
 PIGLIT_GL_TEST_MAIN(
     500 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 static float ortho_left = -1, ortho_right = 8, ortho_bottom = -2, ortho_top = 2;
 
diff --git a/tests/general/pos-array.c b/tests/general/pos-array.c
index 6c91fa8c..b1a91fb3 100644
--- a/tests/general/pos-array.c
+++ b/tests/general/pos-array.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const char *TestName = "pos-array";
 
diff --git a/tests/general/primitive-restart.c b/tests/general/primitive-restart.c
index 8fa66b15..5918918c 100644
--- a/tests/general/primitive-restart.c
+++ b/tests/general/primitive-restart.c
@@ -36,7 +36,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const char *TestName = "primitive-restart";
 
diff --git a/tests/general/provoking-vertex.c b/tests/general/provoking-vertex.c
index ea4cb5fd..46d81d1f 100644
--- a/tests/general/provoking-vertex.c
+++ b/tests/general/provoking-vertex.c
@@ -36,7 +36,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/general/quad-invariance.c b/tests/general/quad-invariance.c
index 64a88e64..5fe12d12 100644
--- a/tests/general/quad-invariance.c
+++ b/tests/general/quad-invariance.c
@@ -41,7 +41,7 @@
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
     128 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/read-front.c b/tests/general/read-front.c
index 83e7da02..2aceb236 100644
--- a/tests/general/read-front.c
+++ b/tests/general/read-front.c
@@ -40,7 +40,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/readpix-z.c b/tests/general/readpix-z.c
index d190ed1a..42c6b7cc 100644
--- a/tests/general/readpix-z.c
+++ b/tests/general/readpix-z.c
@@ -31,7 +31,7 @@
 
 PIGLIT_GL_TEST_MAIN(200 /*window_width*/,
                     200 /*window_height*/,
-                    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
+                    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH);
 
 static void
 draw_z_gradient(GLfloat zLeft, GLfloat zRight)
diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
index 00c92d07..cd937550 100644
--- a/tests/general/roundmode-getintegerv.c
+++ b/tests/general/roundmode-getintegerv.c
@@ -47,7 +47,7 @@
 PIGLIT_GL_TEST_MAIN(
     10 /*window_width*/,
     10 /*window_height*/,
-    GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
index 1ed542ed..59c29b76 100644
--- a/tests/general/roundmode-pixelstore.c
+++ b/tests/general/roundmode-pixelstore.c
@@ -44,7 +44,7 @@
 PIGLIT_GL_TEST_MAIN(
     10 /*window_width*/,
     10 /*window_height*/,
-    GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c
index 31be1ddf..612ffa6c 100644
--- a/tests/general/scissor-bitmap.c
+++ b/tests/general/scissor-bitmap.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     400 /*window_height*/,
-    GLUT_DOUBLE | GLUT_RGB)
+    PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB)
 
 struct probes {
 	struct test_position {
diff --git a/tests/general/scissor-clear.c b/tests/general/scissor-clear.c
index 6a732b1e..022df4a0 100644
--- a/tests/general/scissor-clear.c
+++ b/tests/general/scissor-clear.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_DOUBLE | GLUT_RGB)
+    PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-copypixels.c b/tests/general/scissor-copypixels.c
index 590b8b12..bf08f2b0 100644
--- a/tests/general/scissor-copypixels.c
+++ b/tests/general/scissor-copypixels.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLboolean
 check_red_box_surrounded_by_green(int x, int y, int w, int h)
diff --git a/tests/general/scissor-depth-clear.c b/tests/general/scissor-depth-clear.c
index 64b87f92..e9a76009 100644
--- a/tests/general/scissor-depth-clear.c
+++ b/tests/general/scissor-depth-clear.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-many.c b/tests/general/scissor-many.c
index 31147a80..dcd97e6d 100644
--- a/tests/general/scissor-many.c
+++ b/tests/general/scissor-many.c
@@ -38,7 +38,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-offscreen.c b/tests/general/scissor-offscreen.c
index d3b97a82..49d717ff 100644
--- a/tests/general/scissor-offscreen.c
+++ b/tests/general/scissor-offscreen.c
@@ -39,7 +39,7 @@
 PIGLIT_GL_TEST_MAIN(
     64 /*window_width*/,
     64 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/scissor-stencil-clear.c b/tests/general/scissor-stencil-clear.c
index a13f4e7c..b1e90979 100644
--- a/tests/general/scissor-stencil-clear.c
+++ b/tests/general/scissor-stencil-clear.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/select.c b/tests/general/select.c
index 80f9c443..f28d700e 100644
--- a/tests/general/select.c
+++ b/tests/general/select.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 GLuint ReferenceHitEntries[3][64];
 #define NAME_STACK_DEPTH	0
diff --git a/tests/general/stencil-drawpixels.c b/tests/general/stencil-drawpixels.c
index d39f09c8..eb52a20b 100644
--- a/tests/general/stencil-drawpixels.c
+++ b/tests/general/stencil-drawpixels.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c
index d68c55df..cfce9c3b 100644
--- a/tests/general/stencil-twoside.c
+++ b/tests/general/stencil-twoside.c
@@ -40,7 +40,7 @@ static int use20syntax = 1;
 PIGLIT_GL_TEST_MAIN(
     650 /*window_width*/,
     200 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 static const GLfloat Near = 5.0, Far = 25.0;
 
diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c
index 8f26f5d0..8040008d 100644
--- a/tests/general/stencil-wrap.c
+++ b/tests/general/stencil-wrap.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     550 /*window_width*/,
     200 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/sync_api.c b/tests/general/sync_api.c
index 49f6d5ed..6a8a5034 100644
--- a/tests/general/sync_api.c
+++ b/tests/general/sync_api.c
@@ -34,7 +34,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB)
+    PIGLIT_GL_VISUAL_RGB)
 
 #define FAIL_ON_ERROR(string)						\
 	do {								\
diff --git a/tests/general/texgen.c b/tests/general/texgen.c
index 75144912..c8bb288c 100644
--- a/tests/general/texgen.c
+++ b/tests/general/texgen.c
@@ -31,7 +31,7 @@
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
     128 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static int CurrentTest = 0;
 static int UseFragmentProgram = 0;
diff --git a/tests/general/texunits.c b/tests/general/texunits.c
index cfe80123..31db6bb4 100644
--- a/tests/general/texunits.c
+++ b/tests/general/texunits.c
@@ -33,7 +33,7 @@
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
     128 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 /** random number for checking state */
 static GLfloat Random[128][4];
diff --git a/tests/general/timer_query.c b/tests/general/timer_query.c
index 6ae494e7..3b6ed523 100644
--- a/tests/general/timer_query.c
+++ b/tests/general/timer_query.c
@@ -36,7 +36,7 @@
 PIGLIT_GL_TEST_MAIN(
     180 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH)
 
 static GLuint timer_query;
 
diff --git a/tests/general/triangle-rasterization-overdraw.cpp b/tests/general/triangle-rasterization-overdraw.cpp
index 2791a9e9..d8e04f56 100644
--- a/tests/general/triangle-rasterization-overdraw.cpp
+++ b/tests/general/triangle-rasterization-overdraw.cpp
@@ -74,7 +74,7 @@ int random_test_count = 10;
 PIGLIT_GL_TEST_MAIN(
     1000 /*window_width*/,
     1000 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 /* Globals */
 int test_id = 0;
diff --git a/tests/general/triangle-rasterization.cpp b/tests/general/triangle-rasterization.cpp
index a59551a5..313214c2 100644
--- a/tests/general/triangle-rasterization.cpp
+++ b/tests/general/triangle-rasterization.cpp
@@ -102,7 +102,7 @@ int fbo_height = 256;
 PIGLIT_GL_TEST_MAIN(
     fbo_width /*window_width*/,
     fbo_height /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 /* Globals */
 int test_id = 0;
diff --git a/tests/general/two-sided-lighting-separate-specular.c b/tests/general/two-sided-lighting-separate-specular.c
index f660dff8..1359ec7a 100644
--- a/tests/general/two-sided-lighting-separate-specular.c
+++ b/tests/general/two-sided-lighting-separate-specular.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
     256 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const GLfloat red[4] = {1, 0, 0, 0};
 static const GLfloat green[4] = {0, 1, 0, 1};
diff --git a/tests/general/two-sided-lighting.c b/tests/general/two-sided-lighting.c
index 13084008..e6187a36 100644
--- a/tests/general/two-sided-lighting.c
+++ b/tests/general/two-sided-lighting.c
@@ -37,7 +37,7 @@
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
     256 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const GLfloat green[4] = {0, 1, 0, 1};
 static const GLfloat blue[4] = {0, 0, 1, 1};
diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c
index 553fdd9a..0828690a 100644
--- a/tests/general/user-clip.c
+++ b/tests/general/user-clip.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_DOUBLE)
 
 static const GLfloat clear_color[4] = { 0.5, 0.5, 0.5, 1.0 };
 
diff --git a/tests/general/vao-01.c b/tests/general/vao-01.c
index 40de19ac..b4e158cc 100644
--- a/tests/general/vao-01.c
+++ b/tests/general/vao-01.c
@@ -41,7 +41,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     200 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/vao-02.c b/tests/general/vao-02.c
index eb8d44ed..ec6f1959 100644
--- a/tests/general/vao-02.c
+++ b/tests/general/vao-02.c
@@ -41,7 +41,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     200 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/general/vao-element-array-buffer.c b/tests/general/vao-element-array-buffer.c
index 103f2477..b0079979 100644
--- a/tests/general/vao-element-array-buffer.c
+++ b/tests/general/vao-element-array-buffer.c
@@ -33,7 +33,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     100 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLuint vao;
 
diff --git a/tests/general/varray-disabled.c b/tests/general/varray-disabled.c
index af8e195f..4d2a9b3a 100644
--- a/tests/general/varray-disabled.c
+++ b/tests/general/varray-disabled.c
@@ -39,7 +39,7 @@
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
     128 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static void
 set_colors(GLfloat *color_array, GLfloat *color)
diff --git a/tests/general/vbo-bufferdata.c b/tests/general/vbo-bufferdata.c
index 9a8dbbcb..a0171ccf 100644
--- a/tests/general/vbo-bufferdata.c
+++ b/tests/general/vbo-bufferdata.c
@@ -30,7 +30,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLuint vbo;
 
diff --git a/tests/general/vbo-map-remap.c b/tests/general/vbo-map-remap.c
index db48eda3..661d0aee 100644
--- a/tests/general/vbo-map-remap.c
+++ b/tests/general/vbo-map-remap.c
@@ -29,7 +29,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLuint vbo;
 
diff --git a/tests/general/vbo-subdata-sync.c b/tests/general/vbo-subdata-sync.c
index f9e1f47e..a37982b7 100644
--- a/tests/general/vbo-subdata-sync.c
+++ b/tests/general/vbo-subdata-sync.c
@@ -35,7 +35,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLuint vbo;
 
diff --git a/tests/general/vbo-subdata-zero.c b/tests/general/vbo-subdata-zero.c
index e3af70ea..46f64067 100644
--- a/tests/general/vbo-subdata-zero.c
+++ b/tests/general/vbo-subdata-zero.c
@@ -29,7 +29,7 @@
 PIGLIT_GL_TEST_MAIN(
     400 /*window_width*/,
     300 /*window_height*/,
-    GLUT_RGB | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE)
 
 static GLuint vbo;
 
diff --git a/tests/general/vs-point_size-zero.c b/tests/general/vs-point_size-zero.c
index 8fd596ef..2c647ee0 100644
--- a/tests/general/vs-point_size-zero.c
+++ b/tests/general/vs-point_size-zero.c
@@ -27,7 +27,7 @@
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
     50 /*window_height*/,
-    GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE)
+    PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE)
 
 static const char *vstext =
    "void main() \n"
diff --git a/tests/general/windowoverlap.c b/tests/general/windowoverlap.c
index b35e1861..55a54990 100644
--- a/tests/general/windowoverlap.c
+++ b/tests/general/windowoverlap.c
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
 		Automatic = 1;
 	glutInitWindowPosition(0, 0);
 	glutInitWindowSize(MainWidth, MainHeight);
-	glutInitDisplayMode(GLUT_RGB);
+	glutInitDisplayMode(PIGLIT_GL_VISUAL_RGB);
 	glutCreateWindow(argv[0]);
 	glewInit();
 	glutReshapeFunc(Reshape);