diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-09-22 16:04:35 +0200 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-10-09 19:08:29 -0700 |
| commit | 15e7655425bd1b14824fba91015c4bc6c1b8b359 (patch) | |
| tree | 73d0aad432aaa710b93daaa3f5a8c90db6c15295 /tests | |
| parent | b8ec67144506f806780c06f00252c421811b238a (diff) | |
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>
Diffstat (limited to 'tests')
690 files changed, 711 insertions, 690 deletions
diff --git a/tests/asmparsertest/asmparsertest.c b/tests/asmparsertest/asmparsertest.c index c0f977ec..e1876037 100644 --- a/tests/asmparsertest/asmparsertest.c +++ b/tests/asmparsertest/asmparsertest.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, 250 /*window_height*/, - GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_SINGLE | PIGLIT_GL_VISUAL_DEPTH) char * unix_line_endings(const char *input, size_t length) diff --git a/tests/bugs/crash-cubemap-order.c b/tests/bugs/crash-cubemap-order.c index 4595e8e0..f5c57056 100644 --- a/tests/bugs/crash-cubemap-order.c +++ b/tests/bugs/crash-cubemap-order.c @@ -11,7 +11,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA) enum piglit_result piglit_display(void) diff --git a/tests/bugs/crash-texparameter-before-teximage.c b/tests/bugs/crash-texparameter-before-teximage.c index 345eabb9..e1ca76bb 100644 --- a/tests/bugs/crash-texparameter-before-teximage.c +++ b/tests/bugs/crash-texparameter-before-teximage.c @@ -12,7 +12,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA) enum piglit_result piglit_display(void) diff --git a/tests/bugs/drawbuffer-modes.c b/tests/bugs/drawbuffer-modes.c index 30cb7edb..44a26481 100644 --- a/tests/bugs/drawbuffer-modes.c +++ b/tests/bugs/drawbuffer-modes.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) float color[7][4] = { { 0.1, 0.2, 0.3, 1.0 }, diff --git a/tests/bugs/fdo10370.c b/tests/bugs/fdo10370.c index 5fd84f34..f050adcd 100644 --- a/tests/bugs/fdo10370.c +++ b/tests/bugs/fdo10370.c @@ -8,7 +8,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_SINGLE | GLUT_RGB) + PIGLIT_GL_VISUAL_SINGLE | PIGLIT_GL_VISUAL_RGB) #define BITMAP_WIDTH 1 #define BITMAP_HEIGHT 1 diff --git a/tests/bugs/fdo14575.c b/tests/bugs/fdo14575.c index 0748230a..2d8865ae 100644 --- a/tests/bugs/fdo14575.c +++ b/tests/bugs/fdo14575.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_SINGLE | GLUT_RGB) + PIGLIT_GL_VISUAL_SINGLE | PIGLIT_GL_VISUAL_RGB) void piglit_init(int argc, char**argv) diff --git a/tests/bugs/fdo20701.c b/tests/bugs/fdo20701.c index 08afed65..cf7d0bbd 100644 --- a/tests/bugs/fdo20701.c +++ b/tests/bugs/fdo20701.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static GLuint fb; static GLuint tex; diff --git a/tests/bugs/fdo22540.c b/tests/bugs/fdo22540.c index 2df694bc..b28f17f9 100644 --- a/tests/bugs/fdo22540.c +++ b/tests/bugs/fdo22540.c @@ -28,7 +28,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLuint vBuffer; diff --git a/tests/bugs/fdo23489.c b/tests/bugs/fdo23489.c index ae206bf2..f4e2195c 100644 --- a/tests/bugs/fdo23489.c +++ b/tests/bugs/fdo23489.c @@ -8,7 +8,7 @@ PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, 250 /*window_height*/, - GLUT_SINGLE | GLUT_RGB) + PIGLIT_GL_VISUAL_SINGLE | PIGLIT_GL_VISUAL_RGB) enum piglit_result piglit_display(void) diff --git a/tests/bugs/fdo23670-depth_test.c b/tests/bugs/fdo23670-depth_test.c index cf72240b..0b806f65 100644 --- a/tests/bugs/fdo23670-depth_test.c +++ b/tests/bugs/fdo23670-depth_test.c @@ -29,7 +29,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL) void piglit_init(int argc, char **argv) diff --git a/tests/bugs/fdo23670-drawpix_stencil.c b/tests/bugs/fdo23670-drawpix_stencil.c index ac13a00a..f254a8d3 100644 --- a/tests/bugs/fdo23670-drawpix_stencil.c +++ b/tests/bugs/fdo23670-drawpix_stencil.c @@ -29,7 +29,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL) void piglit_init(int argc, char **argv) diff --git a/tests/bugs/fdo24066.c b/tests/bugs/fdo24066.c index 2d8b1bd3..d0fc3750 100644 --- a/tests/bugs/fdo24066.c +++ b/tests/bugs/fdo24066.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, 16 /*window_height*/, - GLUT_RGBA) + PIGLIT_GL_VISUAL_RGBA) enum piglit_result piglit_display(void) { diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c index 804ac9b8..7c90ec50 100644 --- a/tests/bugs/fdo25614-genmipmap.c +++ b/tests/bugs/fdo25614-genmipmap.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( (BOX_SIZE + 2) * TEST_COLS + 1 /*window_width*/, (BOX_SIZE + 1) + 1 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint tex[1]; diff --git a/tests/bugs/fdo28551.c b/tests/bugs/fdo28551.c index e256571f..dc4173f7 100644 --- a/tests/bugs/fdo28551.c +++ b/tests/bugs/fdo28551.c @@ -29,7 +29,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL) enum piglit_result piglit_display(void) diff --git a/tests/bugs/fdo31934.c b/tests/bugs/fdo31934.c index c1960e3a..f1c69b53 100644 --- a/tests/bugs/fdo31934.c +++ b/tests/bugs/fdo31934.c @@ -3,7 +3,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 512 /*window_height*/, - GLUT_RGBA) + PIGLIT_GL_VISUAL_RGBA) void piglit_init(int argc, char *argv[]) diff --git a/tests/bugs/fdo9833.c b/tests/bugs/fdo9833.c index 0192ec1d..8d8ca39e 100644 --- a/tests/bugs/fdo9833.c +++ b/tests/bugs/fdo9833.c @@ -8,7 +8,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA) enum piglit_result piglit_display(void) diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c index 2862b638..1b429d53 100644 --- a/tests/bugs/point-sprite.c +++ b/tests/bugs/point-sprite.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 1 + ((BOX_SIZE + 1) * TEST_COLS) /*window_width*/, 1 + ((BOX_SIZE + 1) * TEST_ROWS) /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static float maxSize = 0.0f; static GLuint tex; diff --git a/tests/bugs/r300-readcache.c b/tests/bugs/r300-readcache.c index 6f0a65aa..4982c1cc 100644 --- a/tests/bugs/r300-readcache.c +++ b/tests/bugs/r300-readcache.c @@ -21,7 +21,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA) static GLfloat colors[8][3] = { { 1.0, 1.0, 1.0 }, diff --git a/tests/bugs/tex1d-2dborder.c b/tests/bugs/tex1d-2dborder.c index 4d04a9e5..be0cebc1 100644 --- a/tests/bugs/tex1d-2dborder.c +++ b/tests/bugs/tex1d-2dborder.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const GLfloat TextureColor[3] = { 1.0, 0.5, 0.0 }; diff --git a/tests/bugs/tri-tex-crash.c b/tests/bugs/tri-tex-crash.c index ee1a3a65..6702e60a 100644 --- a/tests/bugs/tri-tex-crash.c +++ b/tests/bugs/tri-tex-crash.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static void make_texture(void) diff --git a/tests/bugs/vbo-buffer-unmap.c b/tests/bugs/vbo-buffer-unmap.c index 9be05855..b5e97000 100644 --- a/tests/bugs/vbo-buffer-unmap.c +++ b/tests/bugs/vbo-buffer-unmap.c @@ -36,7 +36,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/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c index 8b19ac32..c6fa0349 100644 --- a/tests/fbo/fbo-1d.c +++ b/tests/fbo/fbo-1d.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, 20 /*window_height*/, - GLUT_DOUBLE | GLUT_DEPTH) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH) static int create_1d_fbo(void) diff --git a/tests/fbo/fbo-3d.c b/tests/fbo/fbo-3d.c index 3fce4961..1b7dda05 100644 --- a/tests/fbo/fbo-3d.c +++ b/tests/fbo/fbo-3d.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) #define NUM_DEPTHS 6 #define POT_DEPTHS 8 diff --git a/tests/fbo/fbo-alpha.c b/tests/fbo/fbo-alpha.c index 09a5d02b..2778a4d4 100644 --- a/tests/fbo/fbo-alpha.c +++ b/tests/fbo/fbo-alpha.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*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/fbo/fbo-alphatest-formats.c b/tests/fbo/fbo-alphatest-formats.c index 09b2277a..d8205d0b 100644 --- a/tests/fbo/fbo-alphatest-formats.c +++ b/tests/fbo/fbo-alphatest-formats.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 64 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) /** * Draw a quad with alpha testing diff --git a/tests/fbo/fbo-alphatest-nocolor-ff.c b/tests/fbo/fbo-alphatest-nocolor-ff.c index 5439d95d..a82be767 100644 --- a/tests/fbo/fbo-alphatest-nocolor-ff.c +++ b/tests/fbo/fbo-alphatest-nocolor-ff.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_DEPTH | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_ALPHA) static void create_fbo(GLuint *out_tex) { diff --git a/tests/fbo/fbo-alphatest-nocolor.c b/tests/fbo/fbo-alphatest-nocolor.c index aec40955..06983d61 100644 --- a/tests/fbo/fbo-alphatest-nocolor.c +++ b/tests/fbo/fbo-alphatest-nocolor.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_DEPTH | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_ALPHA) GLuint prog; diff --git a/tests/fbo/fbo-array.c b/tests/fbo/fbo-array.c index 96216395..bc2338a8 100644 --- a/tests/fbo/fbo-array.c +++ b/tests/fbo/fbo-array.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) #define NUM_LAYERS 6 diff --git a/tests/fbo/fbo-bind-renderbuffer.c b/tests/fbo/fbo-bind-renderbuffer.c index 6b2f4f8d..338c5046 100644 --- a/tests/fbo/fbo-bind-renderbuffer.c +++ b/tests/fbo/fbo-bind-renderbuffer.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) /* Test binding and return error code */ static GLenum diff --git a/tests/fbo/fbo-blending-formats.c b/tests/fbo/fbo-blending-formats.c index 8be09b01..ac7147b6 100644 --- a/tests/fbo/fbo-blending-formats.c +++ b/tests/fbo/fbo-blending-formats.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 64 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static void blend(const float *rect, const float *src, const float *dst, const float *blendcol, GLenum blendsrc, GLenum blenddst) diff --git a/tests/fbo/fbo-blit-d24s8.c b/tests/fbo/fbo-blit-d24s8.c index eca28c30..5e34d2ce 100644 --- a/tests/fbo/fbo-blit-d24s8.c +++ b/tests/fbo/fbo-blit-d24s8.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, 150 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE | GLUT_STENCIL | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_STENCIL | PIGLIT_GL_VISUAL_DEPTH) #define PAD 10 #define SIZE 20 diff --git a/tests/fbo/fbo-blit-stretch.cpp b/tests/fbo/fbo-blit-stretch.cpp index b18a7218..86a18f6b 100644 --- a/tests/fbo/fbo-blit-stretch.cpp +++ b/tests/fbo/fbo-blit-stretch.cpp @@ -54,7 +54,7 @@ PIGLIT_GL_TEST_MAIN( DSTW /*window_width*/, DSTH /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) struct TestCase { diff --git a/tests/fbo/fbo-blit.c b/tests/fbo/fbo-blit.c index 7eb56370..842f689a 100644 --- a/tests/fbo/fbo-blit.c +++ b/tests/fbo/fbo-blit.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, 150 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define PAD 10 #define SIZE 20 diff --git a/tests/fbo/fbo-clear-formats.c b/tests/fbo/fbo-clear-formats.c index 868d3bee..8062d7dd 100644 --- a/tests/fbo/fbo-clear-formats.c +++ b/tests/fbo/fbo-clear-formats.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) /* Do piglit_rgbw_texture() image but using glClear */ static bool diff --git a/tests/fbo/fbo-clearmipmap.c b/tests/fbo/fbo-clearmipmap.c index a71af1ff..cb8ebcea 100644 --- a/tests/fbo/fbo-clearmipmap.c +++ b/tests/fbo/fbo-clearmipmap.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/fbo/fbo-colormask-formats.c b/tests/fbo/fbo-colormask-formats.c index a55e2169..1050ae5f 100644 --- a/tests/fbo/fbo-colormask-formats.c +++ b/tests/fbo/fbo-colormask-formats.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 32 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) /** * Draw a quad with colormask diff --git a/tests/fbo/fbo-copypix.c b/tests/fbo/fbo-copypix.c index f34cbf2c..ccac7e39 100644 --- a/tests/fbo/fbo-copypix.c +++ b/tests/fbo/fbo-copypix.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, 150 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define PAD 10 #define SIZE 20 diff --git a/tests/fbo/fbo-copyteximage-simple.c b/tests/fbo/fbo-copyteximage-simple.c index 6a9d3be9..afbe22b2 100644 --- a/tests/fbo/fbo-copyteximage-simple.c +++ b/tests/fbo/fbo-copyteximage-simple.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( TEX_WIDTH /*window_width*/, TEX_HEIGHT /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const float red[] = {1, 0, 0, 0}; static const float green[] = {0, 1, 0, 0}; diff --git a/tests/fbo/fbo-copyteximage.c b/tests/fbo/fbo-copyteximage.c index 9a6be6f9..db2db511 100644 --- a/tests/fbo/fbo-copyteximage.c +++ b/tests/fbo/fbo-copyteximage.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const float red[] = {1, 0, 0, 0}; static const float green[] = {0, 1, 0, 0}; diff --git a/tests/fbo/fbo-cubemap.c b/tests/fbo/fbo-cubemap.c index cc91a149..bb9a33de 100644 --- a/tests/fbo/fbo-cubemap.c +++ b/tests/fbo/fbo-cubemap.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) float face_color[7][4] = { {1.0, 0.0, 0.0, 0.0}, diff --git a/tests/fbo/fbo-depth-array.c b/tests/fbo/fbo-depth-array.c index 0143fe7c..8f669e01 100644 --- a/tests/fbo/fbo-depth-array.c +++ b/tests/fbo/fbo-depth-array.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) #define NUM_LAYERS 6 diff --git a/tests/fbo/fbo-depth-sample-compare.c b/tests/fbo/fbo-depth-sample-compare.c index aca8cbea..d6c41603 100644 --- a/tests/fbo/fbo-depth-sample-compare.c +++ b/tests/fbo/fbo-depth-sample-compare.c @@ -48,7 +48,7 @@ PIGLIT_GL_TEST_MAIN( 3 * SIZE /*window_width*/, SIZE /*window_height*/, - GLUT_DOUBLE | GLUT_DEPTH) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH) static GLfloat ErrorScale = 0.0; static GLuint ColorTex, DepthTex, FBO; diff --git a/tests/fbo/fbo-depth-tex1d.c b/tests/fbo/fbo-depth-tex1d.c index bc983b53..44bdf979 100644 --- a/tests/fbo/fbo-depth-tex1d.c +++ b/tests/fbo/fbo-depth-tex1d.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, 20 /*window_height*/, - GLUT_DOUBLE | GLUT_DEPTH) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH) #define F(name) #name, name diff --git a/tests/fbo/fbo-depth.c b/tests/fbo/fbo-depth.c index 83080ffb..b2dd80dd 100644 --- a/tests/fbo/fbo-depth.c +++ b/tests/fbo/fbo-depth.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( BUF_SIZE /*window_width*/, BUF_SIZE /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) enum { CLEAR, diff --git a/tests/fbo/fbo-depthstencil.c b/tests/fbo/fbo-depthstencil.c index b5317182..1e07b8c0 100644 --- a/tests/fbo/fbo-depthstencil.c +++ b/tests/fbo/fbo-depthstencil.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( BUF_SIZE /*window_width*/, BUF_SIZE /*window_height*/, - GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL) enum { CLEAR, diff --git a/tests/fbo/fbo-depthtex.c b/tests/fbo/fbo-depthtex.c index d6a18e80..467c6a65 100644 --- a/tests/fbo/fbo-depthtex.c +++ b/tests/fbo/fbo-depthtex.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 640 /*window_width*/, 480 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static void check_fbo_status() diff --git a/tests/fbo/fbo-deriv.c b/tests/fbo/fbo-deriv.c index 68349a5a..783b12c6 100644 --- a/tests/fbo/fbo-deriv.c +++ b/tests/fbo/fbo-deriv.c @@ -48,7 +48,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 128 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA) static const int fbo_width = 128, fbo_height = 128; diff --git a/tests/fbo/fbo-draw-buffers-blend.c b/tests/fbo/fbo-draw-buffers-blend.c index 4fb158a0..30da3291 100644 --- a/tests/fbo/fbo-draw-buffers-blend.c +++ b/tests/fbo/fbo-draw-buffers-blend.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 = "fbo-draw-buffers-blend"; diff --git a/tests/fbo/fbo-drawbuffers-arbfp.c b/tests/fbo/fbo-drawbuffers-arbfp.c index a382b824..9f18f0ea 100644 --- a/tests/fbo/fbo-drawbuffers-arbfp.c +++ b/tests/fbo/fbo-drawbuffers-arbfp.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static float result0[] = {0.7, 0.6, 0.3, 0.1}; static float result1[] = {0.2, 0.9, 0.5, 0.8}; diff --git a/tests/fbo/fbo-drawbuffers-blend-add.c b/tests/fbo/fbo-drawbuffers-blend-add.c index 158cb9e2..c1c0a29b 100644 --- a/tests/fbo/fbo-drawbuffers-blend-add.c +++ b/tests/fbo/fbo-drawbuffers-blend-add.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static GLint max_targets; diff --git a/tests/fbo/fbo-drawbuffers-fragcolor.c b/tests/fbo/fbo-drawbuffers-fragcolor.c index 167855d6..81c1f0f0 100644 --- a/tests/fbo/fbo-drawbuffers-fragcolor.c +++ b/tests/fbo/fbo-drawbuffers-fragcolor.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 GLint max_targets; diff --git a/tests/fbo/fbo-drawbuffers-maxtargets.c b/tests/fbo/fbo-drawbuffers-maxtargets.c index c5b466a3..af953fd5 100644 --- a/tests/fbo/fbo-drawbuffers-maxtargets.c +++ b/tests/fbo/fbo-drawbuffers-maxtargets.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 GLint max_targets; diff --git a/tests/fbo/fbo-drawbuffers.c b/tests/fbo/fbo-drawbuffers.c index 4f63be5a..d5edec2f 100644 --- a/tests/fbo/fbo-drawbuffers.c +++ b/tests/fbo/fbo-drawbuffers.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint attach_texture(int i) diff --git a/tests/fbo/fbo-drawbuffers2-blend.c b/tests/fbo/fbo-drawbuffers2-blend.c index fb9a5b67..06085196 100644 --- a/tests/fbo/fbo-drawbuffers2-blend.c +++ b/tests/fbo/fbo-drawbuffers2-blend.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint attach_texture(int i) diff --git a/tests/fbo/fbo-drawbuffers2-colormask.c b/tests/fbo/fbo-drawbuffers2-colormask.c index e7ca8516..477806b6 100644 --- a/tests/fbo/fbo-drawbuffers2-colormask.c +++ b/tests/fbo/fbo-drawbuffers2-colormask.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint attach_texture(int i) diff --git a/tests/fbo/fbo-finish-deleted.c b/tests/fbo/fbo-finish-deleted.c index 1b02d92c..64220459 100644 --- a/tests/fbo/fbo-finish-deleted.c +++ b/tests/fbo/fbo-finish-deleted.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-flushing-2.c b/tests/fbo/fbo-flushing-2.c index 5250e780..42586c0c 100644 --- a/tests/fbo/fbo-flushing-2.c +++ b/tests/fbo/fbo-flushing-2.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 64 /*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/fbo/fbo-flushing.c b/tests/fbo/fbo-flushing.c index 7d37937a..849e0a00 100644 --- a/tests/fbo/fbo-flushing.c +++ b/tests/fbo/fbo-flushing.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 300 /*window_width*/, 300 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c index 0547b9f3..999b27d8 100644 --- a/tests/fbo/fbo-fragcoord.c +++ b/tests/fbo/fbo-fragcoord.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( WIDTH /*window_width*/, HEIGHT /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) static GLint prog; diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c index 82d439cf..275a6d35 100644 --- a/tests/fbo/fbo-fragcoord2.c +++ b/tests/fbo/fbo-fragcoord2.c @@ -36,7 +36,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 prog; diff --git a/tests/fbo/fbo-generatemipmap-array.c b/tests/fbo/fbo-generatemipmap-array.c index d3fa222b..2d75d6d6 100644 --- a/tests/fbo/fbo-generatemipmap-array.c +++ b/tests/fbo/fbo-generatemipmap-array.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 600 /*window_width*/, 560 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const float red[] = {1, 0, 0, 0}; static const float green[] = {0, 1, 0, 0}; diff --git a/tests/fbo/fbo-generatemipmap-filtering.c b/tests/fbo/fbo-generatemipmap-filtering.c index b431d9b4..6d66835f 100644 --- a/tests/fbo/fbo-generatemipmap-filtering.c +++ b/tests/fbo/fbo-generatemipmap-filtering.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static int create_tex(void) diff --git a/tests/fbo/fbo-generatemipmap-formats.c b/tests/fbo/fbo-generatemipmap-formats.c index a04cb6a6..de528e3f 100644 --- a/tests/fbo/fbo-generatemipmap-formats.c +++ b/tests/fbo/fbo-generatemipmap-formats.c @@ -40,7 +40,7 @@ static int tex_height = 256; PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static void set_npot(GLboolean npot) { diff --git a/tests/fbo/fbo-generatemipmap-noimage.c b/tests/fbo/fbo-generatemipmap-noimage.c index 8b92aa3e..734605a6 100644 --- a/tests/fbo/fbo-generatemipmap-noimage.c +++ b/tests/fbo/fbo-generatemipmap-noimage.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-generatemipmap-nonsquare.c b/tests/fbo/fbo-generatemipmap-nonsquare.c index 99bc4823..bc82734f 100644 --- a/tests/fbo/fbo-generatemipmap-nonsquare.c +++ b/tests/fbo/fbo-generatemipmap-nonsquare.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const float red[] = {1, 0, 0, 0}; static const float green[] = {0, 1, 0, 0}; diff --git a/tests/fbo/fbo-generatemipmap-npot.c b/tests/fbo/fbo-generatemipmap-npot.c index 3d67b0af..eb3032d1 100644 --- a/tests/fbo/fbo-generatemipmap-npot.c +++ b/tests/fbo/fbo-generatemipmap-npot.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const float red[] = {1, 0, 0, 0}; static const float green[] = {0, 1, 0, 0}; diff --git a/tests/fbo/fbo-generatemipmap-scissor.c b/tests/fbo/fbo-generatemipmap-scissor.c index 7dcb9c76..c04568fe 100644 --- a/tests/fbo/fbo-generatemipmap-scissor.c +++ b/tests/fbo/fbo-generatemipmap-scissor.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const float red[] = {1, 0, 0, 0}; static const float green[] = {0, 1, 0, 0}; diff --git a/tests/fbo/fbo-generatemipmap-viewport.c b/tests/fbo/fbo-generatemipmap-viewport.c index 5dae037f..b5369bb3 100644 --- a/tests/fbo/fbo-generatemipmap-viewport.c +++ b/tests/fbo/fbo-generatemipmap-viewport.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const float red[] = {1, 0, 0, 0}; static const float green[] = {0, 1, 0, 0}; diff --git a/tests/fbo/fbo-generatemipmap.c b/tests/fbo/fbo-generatemipmap.c index 2d670966..18db7394 100644 --- a/tests/fbo/fbo-generatemipmap.c +++ b/tests/fbo/fbo-generatemipmap.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const float red[] = {1, 0, 0, 0}; static const float green[] = {0, 1, 0, 0}; diff --git a/tests/fbo/fbo-getframebufferattachmentparameter-01.c b/tests/fbo/fbo-getframebufferattachmentparameter-01.c index fae60eaa..f4f756d8 100644 --- a/tests/fbo/fbo-getframebufferattachmentparameter-01.c +++ b/tests/fbo/fbo-getframebufferattachmentparameter-01.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-gl_pointcoord.c b/tests/fbo/fbo-gl_pointcoord.c index 80e6dd41..9ac47681 100644 --- a/tests/fbo/fbo-gl_pointcoord.c +++ b/tests/fbo/fbo-gl_pointcoord.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_SINGLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_SINGLE) static const char vs_text[] = "#version 120 \n" diff --git a/tests/fbo/fbo-incomplete-texture-01.c b/tests/fbo/fbo-incomplete-texture-01.c index 1c7f19f9..dddf1707 100644 --- a/tests/fbo/fbo-incomplete-texture-01.c +++ b/tests/fbo/fbo-incomplete-texture-01.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-incomplete-texture-02.c b/tests/fbo/fbo-incomplete-texture-02.c index 7e41e76a..98853c3d 100644 --- a/tests/fbo/fbo-incomplete-texture-02.c +++ b/tests/fbo/fbo-incomplete-texture-02.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-incomplete-texture-03.c b/tests/fbo/fbo-incomplete-texture-03.c index 1d655299..69a017d7 100644 --- a/tests/fbo/fbo-incomplete-texture-03.c +++ b/tests/fbo/fbo-incomplete-texture-03.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-incomplete-texture-04.c b/tests/fbo/fbo-incomplete-texture-04.c index 4657b143..b77d45f3 100644 --- a/tests/fbo/fbo-incomplete-texture-04.c +++ b/tests/fbo/fbo-incomplete-texture-04.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-integer.c b/tests/fbo/fbo-integer.c index c9e2c0f8..965d4078 100644 --- a/tests/fbo/fbo-integer.c +++ b/tests/fbo/fbo-integer.c @@ -33,7 +33,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 = "texture-integer"; diff --git a/tests/fbo/fbo-luminance-alpha.c b/tests/fbo/fbo-luminance-alpha.c index 62ef696b..d9ca6e1d 100644 --- a/tests/fbo/fbo-luminance-alpha.c +++ b/tests/fbo/fbo-luminance-alpha.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*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/fbo/fbo-maxsize.c b/tests/fbo/fbo-maxsize.c index ce973a1a..a5c46c8c 100644 --- a/tests/fbo/fbo-maxsize.c +++ b/tests/fbo/fbo-maxsize.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static int find_max_texture_size(void) diff --git a/tests/fbo/fbo-mipmap-copypix.c b/tests/fbo/fbo-mipmap-copypix.c index a7b70db5..0fc7127c 100644 --- a/tests/fbo/fbo-mipmap-copypix.c +++ b/tests/fbo/fbo-mipmap-copypix.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, 50 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const GLuint NumLevels = 10; diff --git a/tests/fbo/fbo-nodepth-test.c b/tests/fbo/fbo-nodepth-test.c index 17187461..e449b8c5 100644 --- a/tests/fbo/fbo-nodepth-test.c +++ b/tests/fbo/fbo-nodepth-test.c @@ -36,7 +36,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/fbo/fbo-nostencil-test.c b/tests/fbo/fbo-nostencil-test.c index 43717495..1613238e 100644 --- a/tests/fbo/fbo-nostencil-test.c +++ b/tests/fbo/fbo-nostencil-test.c @@ -36,7 +36,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/fbo/fbo-pbo-readpixels-small.c b/tests/fbo/fbo-pbo-readpixels-small.c index fc8a9606..88fd28a7 100644 --- a/tests/fbo/fbo-pbo-readpixels-small.c +++ b/tests/fbo/fbo-pbo-readpixels-small.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, 50 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static void make_fbo(GLuint *fbo, GLuint *tex) diff --git a/tests/fbo/fbo-readdrawpix.c b/tests/fbo/fbo-readdrawpix.c index 5aa6b3e6..05243a1e 100644 --- a/tests/fbo/fbo-readdrawpix.c +++ b/tests/fbo/fbo-readdrawpix.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, 150 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define PAD 10 #define SIZE 20 diff --git a/tests/fbo/fbo-readpixels-depth-formats.c b/tests/fbo/fbo-readpixels-depth-formats.c index 72233062..6a80e6a1 100644 --- a/tests/fbo/fbo-readpixels-depth-formats.c +++ b/tests/fbo/fbo-readpixels-depth-formats.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( BUF_WIDTH /*window_width*/, BUF_WIDTH /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) /* Width of our stripes of z = 0.0, 0.5, 1.0 */ static int w = BUF_WIDTH / 3; diff --git a/tests/fbo/fbo-readpixels.c b/tests/fbo/fbo-readpixels.c index c6fcadc3..cc646d9c 100644 --- a/tests/fbo/fbo-readpixels.c +++ b/tests/fbo/fbo-readpixels.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 200 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLboolean test_with_format(GLenum internal_format, GLenum format, diff --git a/tests/fbo/fbo-rg.c b/tests/fbo/fbo-rg.c index b9cfc4db..4aecd05c 100644 --- a/tests/fbo/fbo-rg.c +++ b/tests/fbo/fbo-rg.c @@ -47,7 +47,7 @@ static GLboolean pass = GL_TRUE; PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 64 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const char vert_code[] = "attribute vec2 position;\n" diff --git a/tests/fbo/fbo-scissor-bitmap.c b/tests/fbo/fbo-scissor-bitmap.c index c0a5c153..57693fa2 100644 --- a/tests/fbo/fbo-scissor-bitmap.c +++ b/tests/fbo/fbo-scissor-bitmap.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) struct probes { struct test_position { diff --git a/tests/fbo/fbo-scissor-blit.c b/tests/fbo/fbo-scissor-blit.c index 791d9487..4b12b0bf 100644 --- a/tests/fbo/fbo-scissor-blit.c +++ b/tests/fbo/fbo-scissor-blit.c @@ -40,7 +40,7 @@ static const int width = 128, height = 128; -PIGLIT_GL_TEST_MAIN(width, height, GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) +PIGLIT_GL_TEST_MAIN(width, height, PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) static GLuint src_fbo; static GLuint ref_fbo; diff --git a/tests/fbo/fbo-srgb-blit.c b/tests/fbo/fbo-srgb-blit.c index 30ad4953..1784563a 100644 --- a/tests/fbo/fbo-srgb-blit.c +++ b/tests/fbo/fbo-srgb-blit.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLuint src_tex, dst_tex; static GLuint src_fbo, dst_fbo; diff --git a/tests/fbo/fbo-srgb.c b/tests/fbo/fbo-srgb.c index 9a09c5c1..7f73425c 100644 --- a/tests/fbo/fbo-srgb.c +++ b/tests/fbo/fbo-srgb.c @@ -38,7 +38,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/fbo/fbo-stencil.c b/tests/fbo/fbo-stencil.c index 94497c62..283007e3 100644 --- a/tests/fbo/fbo-stencil.c +++ b/tests/fbo/fbo-stencil.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( BUF_SIZE /*window_width*/, BUF_SIZE /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) enum { CLEAR, diff --git a/tests/fbo/fbo-storage-completeness.c b/tests/fbo/fbo-storage-completeness.c index 40a519aa..3f74ac14 100644 --- a/tests/fbo/fbo-storage-completeness.c +++ b/tests/fbo/fbo-storage-completeness.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static const char *TestName = "fbo-storage-formats"; diff --git a/tests/fbo/fbo-storage-formats.c b/tests/fbo/fbo-storage-formats.c index f51c7901..93f2f4d3 100644 --- a/tests/fbo/fbo-storage-formats.c +++ b/tests/fbo/fbo-storage-formats.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static const char *TestName = "fbo-storage-formats"; diff --git a/tests/fbo/fbo-sys-blit.c b/tests/fbo/fbo-sys-blit.c index 71dbc644..4265ee87 100644 --- a/tests/fbo/fbo-sys-blit.c +++ b/tests/fbo/fbo-sys-blit.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) enum piglit_result piglit_display(void) { diff --git a/tests/fbo/fbo-sys-sub-blit.c b/tests/fbo/fbo-sys-sub-blit.c index 8e7fc986..3e4703bc 100644 --- a/tests/fbo/fbo-sys-sub-blit.c +++ b/tests/fbo/fbo-sys-sub-blit.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) enum piglit_result piglit_display(void) { diff --git a/tests/fbo/fbo-viewport.c b/tests/fbo/fbo-viewport.c index 0374c263..6f07046c 100644 --- a/tests/fbo/fbo-viewport.c +++ b/tests/fbo/fbo-viewport.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, 500 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) /** * Draw some simple quads in a bunch of viewports which tile the window. 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); diff --git a/tests/gles2/gles2_shader_runner.c b/tests/gles2/gles2_shader_runner.c index fd5333ff..0b5d48d5 100644 --- a/tests/gles2/gles2_shader_runner.c +++ b/tests/gles2/gles2_shader_runner.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, 250 /*window_height*/, - GLUT_RGB | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH) static float gles_version = 0.0; static float essl_version = 0.0; diff --git a/tests/glslparsertest/glslparsertest.c b/tests/glslparsertest/glslparsertest.c index a7aa0bc0..ff4c4b93 100644 --- a/tests/glslparsertest/glslparsertest.c +++ b/tests/glslparsertest/glslparsertest.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static char *filename; static int expected_pass; diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s0.c b/tests/hiz/hiz-depth-read-fbo-d24-s0.c index f8ef5dc0..fffd7553 100644 --- a/tests/hiz/hiz-depth-read-fbo-d24-s0.c +++ b/tests/hiz/hiz-depth-read-fbo-d24-s0.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s8.c b/tests/hiz/hiz-depth-read-fbo-d24-s8.c index e5667937..8c6a96e6 100644 --- a/tests/hiz/hiz-depth-read-fbo-d24-s8.c +++ b/tests/hiz/hiz-depth-read-fbo-d24-s8.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-read-fbo-d24s8.c b/tests/hiz/hiz-depth-read-fbo-d24s8.c index cf76234f..b3f985b3 100644 --- a/tests/hiz/hiz-depth-read-fbo-d24s8.c +++ b/tests/hiz/hiz-depth-read-fbo-d24s8.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-read-window-stencil0.c b/tests/hiz/hiz-depth-read-window-stencil0.c index 97598c9d..209f6421 100644 --- a/tests/hiz/hiz-depth-read-window-stencil0.c +++ b/tests/hiz/hiz-depth-read-window-stencil0.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH) void piglit_init(int argc, char **argv) diff --git a/tests/hiz/hiz-depth-read-window-stencil1.c b/tests/hiz/hiz-depth-read-window-stencil1.c index 113b524d..ab8f4bbe 100644 --- a/tests/hiz/hiz-depth-read-window-stencil1.c +++ b/tests/hiz/hiz-depth-read-window-stencil1.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*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) void piglit_init(int argc, char **argv) diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c index 6f980919..c024d6d2 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c index 53675f16..b3bddb3b 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c index 96ef6262..169ccbf4 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c @@ -45,7 +45,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c index 39eb5044..d4d5e4c7 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s0.c b/tests/hiz/hiz-depth-test-fbo-d24-s0.c index 5ff30f97..c9f2e310 100644 --- a/tests/hiz/hiz-depth-test-fbo-d24-s0.c +++ b/tests/hiz/hiz-depth-test-fbo-d24-s0.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s8.c b/tests/hiz/hiz-depth-test-fbo-d24-s8.c index b408b56c..b9eac9ec 100644 --- a/tests/hiz/hiz-depth-test-fbo-d24-s8.c +++ b/tests/hiz/hiz-depth-test-fbo-d24-s8.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-test-fbo-d24s8.c b/tests/hiz/hiz-depth-test-fbo-d24s8.c index e424d513..2febeb1d 100644 --- a/tests/hiz/hiz-depth-test-fbo-d24s8.c +++ b/tests/hiz/hiz-depth-test-fbo-d24s8.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-depth-test-window-stencil0.c b/tests/hiz/hiz-depth-test-window-stencil0.c index 3ae9102c..56fd89ac 100644 --- a/tests/hiz/hiz-depth-test-window-stencil0.c +++ b/tests/hiz/hiz-depth-test-window-stencil0.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH) void piglit_init(int argc, char **argv) diff --git a/tests/hiz/hiz-depth-test-window-stencil1.c b/tests/hiz/hiz-depth-test-window-stencil1.c index 30c56e88..4df7a8a8 100644 --- a/tests/hiz/hiz-depth-test-window-stencil1.c +++ b/tests/hiz/hiz-depth-test-window-stencil1.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*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) void piglit_init(int argc, char **argv) diff --git a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c index af754394..b2c28930 100644 --- a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c +++ b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c index a154a562..231a6d3b 100644 --- a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c +++ b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-stencil-read-fbo-d24s8.c b/tests/hiz/hiz-stencil-read-fbo-d24s8.c index 4d845033..f3b0b596 100644 --- a/tests/hiz/hiz-stencil-read-fbo-d24s8.c +++ b/tests/hiz/hiz-stencil-read-fbo-d24s8.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-stencil-read-window-depth0.c b/tests/hiz/hiz-stencil-read-window-depth0.c index db4391b2..369b2d01 100644 --- a/tests/hiz/hiz-stencil-read-window-depth0.c +++ b/tests/hiz/hiz-stencil-read-window-depth0.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_STENCIL) void piglit_init(int argc, char **argv) diff --git a/tests/hiz/hiz-stencil-read-window-depth1.c b/tests/hiz/hiz-stencil-read-window-depth1.c index 49784bba..e054deb6 100644 --- a/tests/hiz/hiz-stencil-read-window-depth1.c +++ b/tests/hiz/hiz-stencil-read-window-depth1.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_STENCIL | PIGLIT_GL_VISUAL_DEPTH) void piglit_init(int argc, char **argv) diff --git a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c index 5c9716ac..998040b7 100644 --- a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c +++ b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c index 8a31679e..04f14e91 100644 --- a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c +++ b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-stencil-test-fbo-d24s8.c index dd7e9d8b..516c5410 100644 --- a/tests/hiz/hiz-stencil-test-fbo-d24s8.c +++ b/tests/hiz/hiz-stencil-test-fbo-d24s8.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) struct hiz_fbo_options fbo_options = { GL_RGBA, diff --git a/tests/hiz/hiz-stencil-test-window-depth0.c b/tests/hiz/hiz-stencil-test-window-depth0.c index 38d165df..37bcdca9 100644 --- a/tests/hiz/hiz-stencil-test-window-depth0.c +++ b/tests/hiz/hiz-stencil-test-window-depth0.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_STENCIL) void piglit_init(int argc, char **argv) diff --git a/tests/hiz/hiz-stencil-test-window-depth1.c b/tests/hiz/hiz-stencil-test-window-depth1.c index 62125406..bf671051 100644 --- a/tests/hiz/hiz-stencil-test-window-depth1.c +++ b/tests/hiz/hiz-stencil-test-window-depth1.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 400 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_STENCIL | PIGLIT_GL_VISUAL_DEPTH) void piglit_init(int argc, char **argv) diff --git a/tests/security/initialized-fbo.c b/tests/security/initialized-fbo.c index 42797571..85acd90f 100644 --- a/tests/security/initialized-fbo.c +++ b/tests/security/initialized-fbo.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 512 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint fbo, rb; diff --git a/tests/security/initialized-texmemory.c b/tests/security/initialized-texmemory.c index e1c26992..68d318d0 100644 --- a/tests/security/initialized-texmemory.c +++ b/tests/security/initialized-texmemory.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 512 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result diff --git a/tests/security/initialized-vbo.c b/tests/security/initialized-vbo.c index 5caf0eeb..eb167dcd 100644 --- a/tests/security/initialized-vbo.c +++ b/tests/security/initialized-vbo.c @@ -39,7 +39,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 diff --git a/tests/shaders/activeprogram-bad-program.c b/tests/shaders/activeprogram-bad-program.c index b6bf0431..f462ada8 100644 --- a/tests/shaders/activeprogram-bad-program.c +++ b/tests/shaders/activeprogram-bad-program.c @@ -32,7 +32,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 bad_vs_text[] = "vec4 my_ftransform(void);\n" diff --git a/tests/shaders/activeprogram-get.c b/tests/shaders/activeprogram-get.c index cf0d2f93..37ba333c 100644 --- a/tests/shaders/activeprogram-get.c +++ b/tests/shaders/activeprogram-get.c @@ -32,7 +32,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 vs_text[] = "void main() { gl_Position = gl_Vertex; }"; diff --git a/tests/shaders/ati-fs-bad-delete.c b/tests/shaders/ati-fs-bad-delete.c index 7197f5cf..6975e2e0 100644 --- a/tests/shaders/ati-fs-bad-delete.c +++ b/tests/shaders/ati-fs-bad-delete.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) enum piglit_result piglit_display(void) diff --git a/tests/shaders/attribute0.c b/tests/shaders/attribute0.c index e8643251..155b668e 100644 --- a/tests/shaders/attribute0.c +++ b/tests/shaders/attribute0.c @@ -32,7 +32,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 vs_text[] = "attribute vec4 vertex;\n" diff --git a/tests/shaders/createshaderprogram-attached-shaders.c b/tests/shaders/createshaderprogram-attached-shaders.c index d988fdf3..c44f822d 100644 --- a/tests/shaders/createshaderprogram-attached-shaders.c +++ b/tests/shaders/createshaderprogram-attached-shaders.c @@ -32,7 +32,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 vs_text[] = "void main() { gl_Position = gl_Vertex; }"; diff --git a/tests/shaders/createshaderprogram-bad-type.c b/tests/shaders/createshaderprogram-bad-type.c index ab5ba2b3..8450415e 100644 --- a/tests/shaders/createshaderprogram-bad-type.c +++ b/tests/shaders/createshaderprogram-bad-type.c @@ -32,7 +32,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 vs_text[] = "void main() { gl_Position = gl_Vertex; }"; diff --git a/tests/shaders/fp-abs-01.c b/tests/shaders/fp-abs-01.c index 8de36cd4..592643c7 100644 --- a/tests/shaders/fp-abs-01.c +++ b/tests/shaders/fp-abs-01.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char cos_shader_source[] = "!!ARBfp1.0\n" diff --git a/tests/shaders/fp-abs-02.c b/tests/shaders/fp-abs-02.c index a2c5095a..a2d4319f 100644 --- a/tests/shaders/fp-abs-02.c +++ b/tests/shaders/fp-abs-02.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char cos_shader_source[] = "!!ARBfp1.0\n" diff --git a/tests/shaders/fp-condition_codes-01.c b/tests/shaders/fp-condition_codes-01.c index 8f016834..f51d848c 100644 --- a/tests/shaders/fp-condition_codes-01.c +++ b/tests/shaders/fp-condition_codes-01.c @@ -45,7 +45,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_COLS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) #define INVERT_MASK(x) (~(x) & 0x0f) diff --git a/tests/shaders/fp-fog.c b/tests/shaders/fp-fog.c index e977a74f..67b506d9 100644 --- a/tests/shaders/fp-fog.c +++ b/tests/shaders/fp-fog.c @@ -41,7 +41,7 @@ static const char* const program_text = PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, 50 /*window_height*/, - GLUT_RGBA | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static PFNGLFOGCOORDFPROC pglFogCoordf = NULL; diff --git a/tests/shaders/fp-formats.c b/tests/shaders/fp-formats.c index db2ca74e..049c4285 100644 --- a/tests/shaders/fp-formats.c +++ b/tests/shaders/fp-formats.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) /** * Modulate the primary color with the alpha channel of the texture diff --git a/tests/shaders/fp-fragment-position.c b/tests/shaders/fp-fragment-position.c index cc15b77e..f366ab2d 100644 --- a/tests/shaders/fp-fragment-position.c +++ b/tests/shaders/fp-fragment-position.c @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 200 /*window_height*/, - GLUT_RGBA | GLUT_ALPHA | GLUT_DOUBLE | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH) extern float piglit_tolerance[4]; diff --git a/tests/shaders/fp-incomplete-tex.c b/tests/shaders/fp-incomplete-tex.c index 87a66e38..12ce1300 100644 --- a/tests/shaders/fp-incomplete-tex.c +++ b/tests/shaders/fp-incomplete-tex.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGBA | GLUT_ALPHA | GLUT_DOUBLE | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH) #define NUM_PROGRAMS 5 diff --git a/tests/shaders/fp-indirections.c b/tests/shaders/fp-indirections.c index 5f032b2f..2dc9b59b 100644 --- a/tests/shaders/fp-indirections.c +++ b/tests/shaders/fp-indirections.c @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static int get_program_i(GLenum pname) { diff --git a/tests/shaders/fp-indirections2.c b/tests/shaders/fp-indirections2.c index 293c7c91..1b22cd09 100644 --- a/tests/shaders/fp-indirections2.c +++ b/tests/shaders/fp-indirections2.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( TEXTURE_SIZE /*window_width*/, TEXTURE_SIZE /*window_height*/, - GLUT_RGBA) + PIGLIT_GL_VISUAL_RGBA) unsigned int max_samples; unsigned char * texture_data; diff --git a/tests/shaders/fp-kil.c b/tests/shaders/fp-kil.c index 297c6287..87fc8a3b 100644 --- a/tests/shaders/fp-kil.c +++ b/tests/shaders/fp-kil.c @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 200 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH) #define NUM_PROGRAMS 2 diff --git a/tests/shaders/fp-lit-mask.c b/tests/shaders/fp-lit-mask.c index b28b6339..dbb0a16e 100644 --- a/tests/shaders/fp-lit-mask.c +++ b/tests/shaders/fp-lit-mask.c @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 200 /*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) static GLuint FragProg[15]; diff --git a/tests/shaders/fp-lit-src-equals-dst.c b/tests/shaders/fp-lit-src-equals-dst.c index 2bb66c4a..0a8bece6 100644 --- a/tests/shaders/fp-lit-src-equals-dst.c +++ b/tests/shaders/fp-lit-src-equals-dst.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 200 /*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) static GLuint FragProg[15]; diff --git a/tests/shaders/fp-long-alu.c b/tests/shaders/fp-long-alu.c index 0f696f4e..b185d46d 100644 --- a/tests/shaders/fp-long-alu.c +++ b/tests/shaders/fp-long-alu.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) int max_alu_instructions; diff --git a/tests/shaders/fp-rfl.c b/tests/shaders/fp-rfl.c index b61c8a31..c7263ed6 100644 --- a/tests/shaders/fp-rfl.c +++ b/tests/shaders/fp-rfl.c @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE + 1) * TEST_COLS)+1) /*window_width*/, (((BOX_SIZE + 1) * TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vert_shader_source[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/fp-set-01.c b/tests/shaders/fp-set-01.c index 72a0968c..ba30c99f 100644 --- a/tests/shaders/fp-set-01.c +++ b/tests/shaders/fp-set-01.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) /** * Source for the fragment program to render the reference box. diff --git a/tests/shaders/fp-set-02.c b/tests/shaders/fp-set-02.c index fff001f2..2285b8d9 100644 --- a/tests/shaders/fp-set-02.c +++ b/tests/shaders/fp-set-02.c @@ -73,7 +73,7 @@ struct { PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) /** * Source for the fragment program to render the reference box. diff --git a/tests/shaders/fp-unpack-01.c b/tests/shaders/fp-unpack-01.c index 4d8988e5..44bcef14 100644 --- a/tests/shaders/fp-unpack-01.c +++ b/tests/shaders/fp-unpack-01.c @@ -45,7 +45,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static char shader_source[64 * 1024]; static GLfloat colors[TEST_COLS][4]; diff --git a/tests/shaders/getuniform-01.c b/tests/shaders/getuniform-01.c index e435e492..ae6e58f9 100644 --- a/tests/shaders/getuniform-01.c +++ b/tests/shaders/getuniform-01.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 20 /*window_width*/, 20 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "uniform float c[4];\n" diff --git a/tests/shaders/getuniform-02.c b/tests/shaders/getuniform-02.c index d4b1b54c..f5686098 100644 --- a/tests/shaders/getuniform-02.c +++ b/tests/shaders/getuniform-02.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 20 /*window_width*/, 20 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static char *TestName = "getuniform-02"; diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c index 4943ec5a..0955adb0 100644 --- a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c +++ b/tests/shaders/glsl-arb-fragment-coord-conventions-define.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) static GLint prog; diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions.c b/tests/shaders/glsl-arb-fragment-coord-conventions.c index b7550ef7..8309cf3d 100644 --- a/tests/shaders/glsl-arb-fragment-coord-conventions.c +++ b/tests/shaders/glsl-arb-fragment-coord-conventions.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) static const float black[4] = {0.0, 0.0, 0.0, 0.0}; static const float red[4] = {1.0, 0.0, 0.0, 0.0}; diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c index cda840e8..1daf0572 100644 --- a/tests/shaders/glsl-bindattriblocation.c +++ b/tests/shaders/glsl-bindattriblocation.c @@ -45,7 +45,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 GLchar *vertShaderText = "attribute vec4 attrib;\n" diff --git a/tests/shaders/glsl-bug-22603.c b/tests/shaders/glsl-bug-22603.c index 95f16db8..c017f4ff 100644 --- a/tests/shaders/glsl-bug-22603.c +++ b/tests/shaders/glsl-bug-22603.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 800 /*window_width*/, 600 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) /* Misbehaviour: first: the quads are not drawn in the correct order * (darker equals closer to the viewer), second: the middle one is strangely diff --git a/tests/shaders/glsl-cos.c b/tests/shaders/glsl-cos.c index 8a9ea5d9..fc0acd29 100644 --- a/tests/shaders/glsl-cos.c +++ b/tests/shaders/glsl-cos.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 char vs_code[] = "uniform float a;\n" diff --git a/tests/shaders/glsl-deriv-varyings.c b/tests/shaders/glsl-deriv-varyings.c index c8f2bbf4..e043c8c9 100644 --- a/tests/shaders/glsl-deriv-varyings.c +++ b/tests/shaders/glsl-deriv-varyings.c @@ -36,7 +36,7 @@ static void loadTex(void); PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 300 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint tex[1]; static GLint prog1; diff --git a/tests/shaders/glsl-derivs.c b/tests/shaders/glsl-derivs.c index 5e25d93c..31160b45 100644 --- a/tests/shaders/glsl-derivs.c +++ b/tests/shaders/glsl-derivs.c @@ -36,7 +36,7 @@ static void loadTex(void); PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 300 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint tex[1]; static GLint prog1; diff --git a/tests/shaders/glsl-dlist-getattriblocation.c b/tests/shaders/glsl-dlist-getattriblocation.c index a56a1f91..1e15ac8f 100644 --- a/tests/shaders/glsl-dlist-getattriblocation.c +++ b/tests/shaders/glsl-dlist-getattriblocation.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static const GLchar *vertShaderText = "attribute vec4 attrib;\n" diff --git a/tests/shaders/glsl-empty-vs-no-fs.c b/tests/shaders/glsl-empty-vs-no-fs.c index bfe2444f..46dc16fc 100644 --- a/tests/shaders/glsl-empty-vs-no-fs.c +++ b/tests/shaders/glsl-empty-vs-no-fs.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, 250 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char *vs_source = "void main() {}"; diff --git a/tests/shaders/glsl-explicit-location-01.c b/tests/shaders/glsl-explicit-location-01.c index 0b8b31b5..483e7396 100644 --- a/tests/shaders/glsl-explicit-location-01.c +++ b/tests/shaders/glsl-explicit-location-01.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/shaders/glsl-explicit-location-02.c b/tests/shaders/glsl-explicit-location-02.c index 93084fa8..9096f194 100644 --- a/tests/shaders/glsl-explicit-location-02.c +++ b/tests/shaders/glsl-explicit-location-02.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/shaders/glsl-explicit-location-03.c b/tests/shaders/glsl-explicit-location-03.c index 7661ea42..103f4e97 100644 --- a/tests/shaders/glsl-explicit-location-03.c +++ b/tests/shaders/glsl-explicit-location-03.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/shaders/glsl-explicit-location-04.c b/tests/shaders/glsl-explicit-location-04.c index a5c99ca0..b1668474 100644 --- a/tests/shaders/glsl-explicit-location-04.c +++ b/tests/shaders/glsl-explicit-location-04.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) enum piglit_result piglit_display(void) diff --git a/tests/shaders/glsl-explicit-location-05.c b/tests/shaders/glsl-explicit-location-05.c index bf79900e..69587867 100644 --- a/tests/shaders/glsl-explicit-location-05.c +++ b/tests/shaders/glsl-explicit-location-05.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/shaders/glsl-fs-bug25902.c b/tests/shaders/glsl-fs-bug25902.c index a5052496..988c0c31 100644 --- a/tests/shaders/glsl-fs-bug25902.c +++ b/tests/shaders/glsl-fs-bug25902.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) static int args_location, tex_location; static GLint prog; diff --git a/tests/shaders/glsl-fs-color-matrix.c b/tests/shaders/glsl-fs-color-matrix.c index d3982754..5098f24e 100644 --- a/tests/shaders/glsl-fs-color-matrix.c +++ b/tests/shaders/glsl-fs-color-matrix.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) const char *vs_text = "attribute vec4 vertex;\n" diff --git a/tests/shaders/glsl-fs-discard-02.c b/tests/shaders/glsl-fs-discard-02.c index 278b0f48..b08d81b4 100644 --- a/tests/shaders/glsl-fs-discard-02.c +++ b/tests/shaders/glsl-fs-discard-02.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*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) static char vs_code[] = "varying vec4 color;" diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c index 4ecd8705..696b1846 100644 --- a/tests/shaders/glsl-fs-exp2.c +++ b/tests/shaders/glsl-fs-exp2.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 int args1_location, args2_location; static GLint prog; diff --git a/tests/shaders/glsl-fs-flat-color.c b/tests/shaders/glsl-fs-flat-color.c index fa5cbca9..c3b45b60 100644 --- a/tests/shaders/glsl-fs-flat-color.c +++ b/tests/shaders/glsl-fs-flat-color.c @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) GLuint prog; diff --git a/tests/shaders/glsl-fs-fogcolor-statechange.c b/tests/shaders/glsl-fs-fogcolor-statechange.c index 4a8aa5ba..d059442f 100644 --- a/tests/shaders/glsl-fs-fogcolor-statechange.c +++ b/tests/shaders/glsl-fs-fogcolor-statechange.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*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/shaders/glsl-fs-fragcoord-zw-ortho.c b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c index 5bd317ef..34f561db 100644 --- a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c +++ b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH) static void draw_quad(float x, float y, float w, float h) diff --git a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c index 8d16693e..b997f200 100644 --- a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c +++ b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH) static GLfloat Znear = 1.0, Zfar = 10.0; diff --git a/tests/shaders/glsl-fs-fragcoord.c b/tests/shaders/glsl-fs-fragcoord.c index dbbfd135..a7309daa 100644 --- a/tests/shaders/glsl-fs-fragcoord.c +++ b/tests/shaders/glsl-fs-fragcoord.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLint prog; diff --git a/tests/shaders/glsl-fs-loop-nested.c b/tests/shaders/glsl-fs-loop-nested.c index bb3d9cc6..9de20f60 100644 --- a/tests/shaders/glsl-fs-loop-nested.c +++ b/tests/shaders/glsl-fs-loop-nested.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static int color_location; static GLint prog; diff --git a/tests/shaders/glsl-fs-loop.c b/tests/shaders/glsl-fs-loop.c index 559f2354..eafc32c4 100644 --- a/tests/shaders/glsl-fs-loop.c +++ b/tests/shaders/glsl-fs-loop.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static int color_location; static GLint prog; diff --git a/tests/shaders/glsl-fs-mix-constant.c b/tests/shaders/glsl-fs-mix-constant.c index e98391c5..fcbf76f1 100644 --- a/tests/shaders/glsl-fs-mix-constant.c +++ b/tests/shaders/glsl-fs-mix-constant.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) static GLint prog; diff --git a/tests/shaders/glsl-fs-mix.c b/tests/shaders/glsl-fs-mix.c index 23745061..90fe8fa5 100644 --- a/tests/shaders/glsl-fs-mix.c +++ b/tests/shaders/glsl-fs-mix.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) static int args1_location, args2_location, args3_location; static GLint prog; diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c index e0966585..7112deec 100644 --- a/tests/shaders/glsl-fs-pointcoord.c +++ b/tests/shaders/glsl-fs-pointcoord.c @@ -47,7 +47,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLint prog; static GLint point_size; diff --git a/tests/shaders/glsl-fs-raytrace-bug27060.c b/tests/shaders/glsl-fs-raytrace-bug27060.c index 966a476f..12d92783 100644 --- a/tests/shaders/glsl-fs-raytrace-bug27060.c +++ b/tests/shaders/glsl-fs-raytrace-bug27060.c @@ -28,7 +28,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLint program = -1; static float rot[9] = {1,0,0, 0,1,0, 0,0,1}; diff --git a/tests/shaders/glsl-fs-sampler-numbering.c b/tests/shaders/glsl-fs-sampler-numbering.c index 56648a3e..0ed8d051 100644 --- a/tests/shaders/glsl-fs-sampler-numbering.c +++ b/tests/shaders/glsl-fs-sampler-numbering.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) static int sampler_location; static GLint prog; diff --git a/tests/shaders/glsl-fs-shader-stencil-export.c b/tests/shaders/glsl-fs-shader-stencil-export.c index d27ba596..d1dbbcc3 100644 --- a/tests/shaders/glsl-fs-shader-stencil-export.c +++ b/tests/shaders/glsl-fs-shader-stencil-export.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*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 GLint prog; diff --git a/tests/shaders/glsl-fs-sqrt-branch.c b/tests/shaders/glsl-fs-sqrt-branch.c index 48343834..eb90cbb0 100644 --- a/tests/shaders/glsl-fs-sqrt-branch.c +++ b/tests/shaders/glsl-fs-sqrt-branch.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) static int args1_location, args2_location; static GLint prog; diff --git a/tests/shaders/glsl-fs-texture2drect.c b/tests/shaders/glsl-fs-texture2drect.c index 764d00ad..e05628c2 100644 --- a/tests/shaders/glsl-fs-texture2drect.c +++ b/tests/shaders/glsl-fs-texture2drect.c @@ -35,7 +35,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 GLint prog; float red[4] = {1.0, 0.0, 0.0, 1.0}; diff --git a/tests/shaders/glsl-fs-texturecube-2.c b/tests/shaders/glsl-fs-texturecube-2.c index 38fa6f82..9783aa27 100644 --- a/tests/shaders/glsl-fs-texturecube-2.c +++ b/tests/shaders/glsl-fs-texturecube-2.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( SIZE * 6 /*window_width*/, SIZE /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static GLint prog; diff --git a/tests/shaders/glsl-fs-texturecube.c b/tests/shaders/glsl-fs-texturecube.c index 5f54eabc..db04033c 100644 --- a/tests/shaders/glsl-fs-texturecube.c +++ b/tests/shaders/glsl-fs-texturecube.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 120 /*window_width*/, 20 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static GLint prog; diff --git a/tests/shaders/glsl-fs-textureenvcolor-statechange.c b/tests/shaders/glsl-fs-textureenvcolor-statechange.c index 5b069524..cb737509 100644 --- a/tests/shaders/glsl-fs-textureenvcolor-statechange.c +++ b/tests/shaders/glsl-fs-textureenvcolor-statechange.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*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/shaders/glsl-fs-user-varying-ff.c b/tests/shaders/glsl-fs-user-varying-ff.c index 771d0fe9..092551fb 100644 --- a/tests/shaders/glsl-fs-user-varying-ff.c +++ b/tests/shaders/glsl-fs-user-varying-ff.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char fs_text[] = "varying vec4 color;\n" diff --git a/tests/shaders/glsl-fwidth.c b/tests/shaders/glsl-fwidth.c index 26358fd8..d839c1a1 100644 --- a/tests/shaders/glsl-fwidth.c +++ b/tests/shaders/glsl-fwidth.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 300 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static void loadTex(void); static void compileLinkProg(void); diff --git a/tests/shaders/glsl-getactiveuniform-array-size.c b/tests/shaders/glsl-getactiveuniform-array-size.c index a3cfa96b..39ffff70 100644 --- a/tests/shaders/glsl-getactiveuniform-array-size.c +++ b/tests/shaders/glsl-getactiveuniform-array-size.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 GLint prog; diff --git a/tests/shaders/glsl-getactiveuniform-count.c b/tests/shaders/glsl-getactiveuniform-count.c index edf3c3b0..1317d50b 100644 --- a/tests/shaders/glsl-getactiveuniform-count.c +++ b/tests/shaders/glsl-getactiveuniform-count.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) static GLint prog; diff --git a/tests/shaders/glsl-getactiveuniform-length.c b/tests/shaders/glsl-getactiveuniform-length.c index 623a59cc..65ddaff3 100644 --- a/tests/shaders/glsl-getactiveuniform-length.c +++ b/tests/shaders/glsl-getactiveuniform-length.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) static GLint prog; diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c index a444384d..5ccf31a1 100644 --- a/tests/shaders/glsl-getattriblocation.c +++ b/tests/shaders/glsl-getattriblocation.c @@ -46,7 +46,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 GLchar *vertShaderText = "attribute vec4 attrib;\n" diff --git a/tests/shaders/glsl-invalid-asm-01.c b/tests/shaders/glsl-invalid-asm-01.c index 3cf38d77..4e5d623f 100644 --- a/tests/shaders/glsl-invalid-asm-01.c +++ b/tests/shaders/glsl-invalid-asm-01.c @@ -42,7 +42,7 @@ static const char fp_text[] = 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/shaders/glsl-invalid-asm-02.c b/tests/shaders/glsl-invalid-asm-02.c index 5cd3b158..6cbbe0c6 100644 --- a/tests/shaders/glsl-invalid-asm-02.c +++ b/tests/shaders/glsl-invalid-asm-02.c @@ -41,7 +41,7 @@ static const char vp_text[] = 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/shaders/glsl-kwin-blur-1.c b/tests/shaders/glsl-kwin-blur-1.c index 1ab4dc68..88d6af21 100644 --- a/tests/shaders/glsl-kwin-blur-1.c +++ b/tests/shaders/glsl-kwin-blur-1.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) /* Note: In KWin, the code for these shaders is generated at runtime, diff --git a/tests/shaders/glsl-kwin-blur-2.c b/tests/shaders/glsl-kwin-blur-2.c index adb92c84..23acda62 100644 --- a/tests/shaders/glsl-kwin-blur-2.c +++ b/tests/shaders/glsl-kwin-blur-2.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) /* Note: In KWin, the code for these shaders is generated at runtime, diff --git a/tests/shaders/glsl-light-model.c b/tests/shaders/glsl-light-model.c index 35ff19fe..744320b8 100644 --- a/tests/shaders/glsl-light-model.c +++ b/tests/shaders/glsl-light-model.c @@ -39,7 +39,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 GLfloat verts[12] = { 10.0, 10.0, diff --git a/tests/shaders/glsl-link-bug30552.c b/tests/shaders/glsl-link-bug30552.c index 3d848414..9615215b 100644 --- a/tests/shaders/glsl-link-bug30552.c +++ b/tests/shaders/glsl-link-bug30552.c @@ -32,7 +32,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/shaders/glsl-link-bug38015.c b/tests/shaders/glsl-link-bug38015.c index 663eb85f..7699ca52 100644 --- a/tests/shaders/glsl-link-bug38015.c +++ b/tests/shaders/glsl-link-bug38015.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 fs_text[] = "#extension GL_ARB_shader_texture_lod : enable\n" diff --git a/tests/shaders/glsl-link-empty-prog-01.c b/tests/shaders/glsl-link-empty-prog-01.c index 70707f31..e3ba105f 100644 --- a/tests/shaders/glsl-link-empty-prog-01.c +++ b/tests/shaders/glsl-link-empty-prog-01.c @@ -26,7 +26,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/shaders/glsl-link-empty-prog-02.c b/tests/shaders/glsl-link-empty-prog-02.c index 579c1ffe..74b05972 100644 --- a/tests/shaders/glsl-link-empty-prog-02.c +++ b/tests/shaders/glsl-link-empty-prog-02.c @@ -58,7 +58,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint prog = 0; static GLuint tex = 0; diff --git a/tests/shaders/glsl-link-initializer-03.c b/tests/shaders/glsl-link-initializer-03.c index 776a012e..2bba219c 100644 --- a/tests/shaders/glsl-link-initializer-03.c +++ b/tests/shaders/glsl-link-initializer-03.c @@ -39,7 +39,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/shaders/glsl-link-test.c b/tests/shaders/glsl-link-test.c index 56fd636b..2fca629c 100644 --- a/tests/shaders/glsl-link-test.c +++ b/tests/shaders/glsl-link-test.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) enum piglit_result piglit_display(void) diff --git a/tests/shaders/glsl-lod-bias.c b/tests/shaders/glsl-lod-bias.c index ff99099c..a34d6de6 100644 --- a/tests/shaders/glsl-lod-bias.c +++ b/tests/shaders/glsl-lod-bias.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( (BOX_SIZE + 2) * TEST_COLS + 1 /*window_width*/, (BOX_SIZE + 1) + 1 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint tex[1]; static GLint prog; diff --git a/tests/shaders/glsl-mat-attribute.c b/tests/shaders/glsl-mat-attribute.c index f4b51818..1de3e4f9 100644 --- a/tests/shaders/glsl-mat-attribute.c +++ b/tests/shaders/glsl-mat-attribute.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*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) static GLint prog[4]; diff --git a/tests/shaders/glsl-max-varyings.c b/tests/shaders/glsl-max-varyings.c index dead8e37..934c66c8 100644 --- a/tests/shaders/glsl-max-varyings.c +++ b/tests/shaders/glsl-max-varyings.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( (2 + MAX_VARYING * 12) /*window_width*/, (2 + MAX_VARYING * 12) /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) /* Generate a VS that writes to num_varyings vec4s, and put * interesting data in data_varying with 0.0 everywhere else. diff --git a/tests/shaders/glsl-max-vertex-attrib.c b/tests/shaders/glsl-max-vertex-attrib.c index f0b1873d..8fbdd764 100644 --- a/tests/shaders/glsl-max-vertex-attrib.c +++ b/tests/shaders/glsl-max-vertex-attrib.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, 250 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static int test = 0; diff --git a/tests/shaders/glsl-novertexdata.c b/tests/shaders/glsl-novertexdata.c index 66253fe0..4165a9ee 100644 --- a/tests/shaders/glsl-novertexdata.c +++ b/tests/shaders/glsl-novertexdata.c @@ -46,7 +46,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 GLchar *vertShaderText = "attribute vec4 attrib;\n" diff --git a/tests/shaders/glsl-orangebook-ch06-bump.c b/tests/shaders/glsl-orangebook-ch06-bump.c index 56e7bcf7..260a480d 100644 --- a/tests/shaders/glsl-orangebook-ch06-bump.c +++ b/tests/shaders/glsl-orangebook-ch06-bump.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) static int bump_density_location, bump_size_location; static int specular_factor_location, surface_color_location; diff --git a/tests/shaders/glsl-preprocessor-comments.c b/tests/shaders/glsl-preprocessor-comments.c index 82333a29..e2d90efc 100644 --- a/tests/shaders/glsl-preprocessor-comments.c +++ b/tests/shaders/glsl-preprocessor-comments.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static int args1_location; static GLint prog; diff --git a/tests/shaders/glsl-reload-source.c b/tests/shaders/glsl-reload-source.c index fb0802d3..785e12e0 100644 --- a/tests/shaders/glsl-reload-source.c +++ b/tests/shaders/glsl-reload-source.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static const char vs_one[] = "varying vec4 color;\n" diff --git a/tests/shaders/glsl-routing.c b/tests/shaders/glsl-routing.c index acabde2d..c6ed396f 100644 --- a/tests/shaders/glsl-routing.c +++ b/tests/shaders/glsl-routing.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 260 /*window_width*/, 365 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define COLORS 2 #define TEXCOORDS 6 diff --git a/tests/shaders/glsl-sin.c b/tests/shaders/glsl-sin.c index 2f40f965..9b76701d 100644 --- a/tests/shaders/glsl-sin.c +++ b/tests/shaders/glsl-sin.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 char vs_code[] = "uniform float a;\n" diff --git a/tests/shaders/glsl-uniform-out-of-bounds.c b/tests/shaders/glsl-uniform-out-of-bounds.c index aa36c83f..cddf9cd2 100644 --- a/tests/shaders/glsl-uniform-out-of-bounds.c +++ b/tests/shaders/glsl-uniform-out-of-bounds.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static void expect_error(GLenum expect, const char * where, ...) { diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c index 12439f40..11f6081c 100644 --- a/tests/shaders/glsl-uniform-update.c +++ b/tests/shaders/glsl-uniform-update.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static int color_location; static GLint prog; diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c index 07474c35..dad744b7 100644 --- a/tests/shaders/glsl-unused-varying.c +++ b/tests/shaders/glsl-unused-varying.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static int do_red_location; static int red_location; diff --git a/tests/shaders/glsl-useprogram-displaylist.c b/tests/shaders/glsl-useprogram-displaylist.c index 1cc2d1f9..514b2494 100644 --- a/tests/shaders/glsl-useprogram-displaylist.c +++ b/tests/shaders/glsl-useprogram-displaylist.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 GLint progr; static GLint progg; diff --git a/tests/shaders/glsl-vs-arrays.c b/tests/shaders/glsl-vs-arrays.c index 17f9a016..73a7601e 100644 --- a/tests/shaders/glsl-vs-arrays.c +++ b/tests/shaders/glsl-vs-arrays.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 GLint prog; static int index1_location, index2_location; diff --git a/tests/shaders/glsl-vs-functions.c b/tests/shaders/glsl-vs-functions.c index 16a0a471..9677d90a 100644 --- a/tests/shaders/glsl-vs-functions.c +++ b/tests/shaders/glsl-vs-functions.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) static GLint prog; static int args1_location; diff --git a/tests/shaders/glsl-vs-if-bool.c b/tests/shaders/glsl-vs-if-bool.c index 05d4e878..7bb856c1 100644 --- a/tests/shaders/glsl-vs-if-bool.c +++ b/tests/shaders/glsl-vs-if-bool.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 GLint prog; static int red_location; diff --git a/tests/shaders/glsl-vs-loop-nested.c b/tests/shaders/glsl-vs-loop-nested.c index ec2b043d..e0757d26 100644 --- a/tests/shaders/glsl-vs-loop-nested.c +++ b/tests/shaders/glsl-vs-loop-nested.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLint prog; diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c index b1f6bf7e..be054196 100644 --- a/tests/shaders/glsl-vs-loop.c +++ b/tests/shaders/glsl-vs-loop.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static int color_location; static GLint prog; diff --git a/tests/shaders/glsl-vs-mov-after-deref.c b/tests/shaders/glsl-vs-mov-after-deref.c index 98c0f94c..f766b81e 100644 --- a/tests/shaders/glsl-vs-mov-after-deref.c +++ b/tests/shaders/glsl-vs-mov-after-deref.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) static GLint prog; static int index_location; diff --git a/tests/shaders/glsl-vs-mvp-statechange.c b/tests/shaders/glsl-vs-mvp-statechange.c index a8f18345..cae1e843 100644 --- a/tests/shaders/glsl-vs-mvp-statechange.c +++ b/tests/shaders/glsl-vs-mvp-statechange.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*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/shaders/glsl-vs-normalscale.c b/tests/shaders/glsl-vs-normalscale.c index 64c00c00..db125422 100644 --- a/tests/shaders/glsl-vs-normalscale.c +++ b/tests/shaders/glsl-vs-normalscale.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 GLint prog; diff --git a/tests/shaders/glsl-vs-point-size.c b/tests/shaders/glsl-vs-point-size.c index 7a1c3080..1c9cae48 100644 --- a/tests/shaders/glsl-vs-point-size.c +++ b/tests/shaders/glsl-vs-point-size.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLint prog; diff --git a/tests/shaders/glsl-vs-raytrace-bug26691.c b/tests/shaders/glsl-vs-raytrace-bug26691.c index 9ed4e454..cdb0b09e 100644 --- a/tests/shaders/glsl-vs-raytrace-bug26691.c +++ b/tests/shaders/glsl-vs-raytrace-bug26691.c @@ -28,7 +28,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 float failing_pixel_percentage = 0.15F; diff --git a/tests/shaders/glsl-vs-statechange-1.c b/tests/shaders/glsl-vs-statechange-1.c index 3e2a5366..d102dd7d 100644 --- a/tests/shaders/glsl-vs-statechange-1.c +++ b/tests/shaders/glsl-vs-statechange-1.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, 50 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) const char *vs_source = "void main()\n" diff --git a/tests/shaders/glsl-vs-texturematrix-1.c b/tests/shaders/glsl-vs-texturematrix-1.c index 013f5568..ec7edbaa 100644 --- a/tests/shaders/glsl-vs-texturematrix-1.c +++ b/tests/shaders/glsl-vs-texturematrix-1.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 GLint prog; diff --git a/tests/shaders/glsl-vs-texturematrix-2.c b/tests/shaders/glsl-vs-texturematrix-2.c index 806d01ee..d8cf2e43 100644 --- a/tests/shaders/glsl-vs-texturematrix-2.c +++ b/tests/shaders/glsl-vs-texturematrix-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) static GLint prog; diff --git a/tests/shaders/glsl-vs-user-varying-ff.c b/tests/shaders/glsl-vs-user-varying-ff.c index e2739895..04dffa22 100644 --- a/tests/shaders/glsl-vs-user-varying-ff.c +++ b/tests/shaders/glsl-vs-user-varying-ff.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "varying vec4 color;\n" diff --git a/tests/shaders/gpu_shader4_attribs.c b/tests/shaders/gpu_shader4_attribs.c index d9c0a997..43397777 100644 --- a/tests/shaders/gpu_shader4_attribs.c +++ b/tests/shaders/gpu_shader4_attribs.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 = "texture-integer"; static const GLuint Index = 3; diff --git a/tests/shaders/link-mismatch-layout-01.c b/tests/shaders/link-mismatch-layout-01.c index d7799782..448314d5 100644 --- a/tests/shaders/link-mismatch-layout-01.c +++ b/tests/shaders/link-mismatch-layout-01.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) static const char layout_center[] = "#extension GL_ARB_fragment_coord_conventions: enable\n" diff --git a/tests/shaders/link-mismatch-layout-02.c b/tests/shaders/link-mismatch-layout-02.c index 254acb18..907ccb4c 100644 --- a/tests/shaders/link-mismatch-layout-02.c +++ b/tests/shaders/link-mismatch-layout-02.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) static const char layout_greater[] = "#extension GL_AMD_conservative_depth: require\n" diff --git a/tests/shaders/link-mismatch-layout-03.c b/tests/shaders/link-mismatch-layout-03.c index e5b7dba2..baca2351 100644 --- a/tests/shaders/link-mismatch-layout-03.c +++ b/tests/shaders/link-mismatch-layout-03.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) static const char layout_center[] = "#extension GL_ARB_fragment_coord_conventions: enable\n" diff --git a/tests/shaders/link-unresolved-function.c b/tests/shaders/link-unresolved-function.c index 1e7d0d4a..7be7b7bc 100644 --- a/tests/shaders/link-unresolved-function.c +++ b/tests/shaders/link-unresolved-function.c @@ -32,7 +32,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 bad_vs_text[] = "vec4 my_ftransform(void);\n" diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index 1d6cfe0b..13e2f94a 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, 250 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) extern float piglit_tolerance[4]; diff --git a/tests/shaders/sso-simple.c b/tests/shaders/sso-simple.c index 5bf3e8fe..26aeb654 100644 --- a/tests/shaders/sso-simple.c +++ b/tests/shaders/sso-simple.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "void main() { gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; " diff --git a/tests/shaders/sso-uniforms-01.c b/tests/shaders/sso-uniforms-01.c index 73c408c9..c9917670 100644 --- a/tests/shaders/sso-uniforms-01.c +++ b/tests/shaders/sso-uniforms-01.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "uniform vec4 color;\n" diff --git a/tests/shaders/sso-uniforms-02.c b/tests/shaders/sso-uniforms-02.c index fd49b45b..9febc2d0 100644 --- a/tests/shaders/sso-uniforms-02.c +++ b/tests/shaders/sso-uniforms-02.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "uniform vec4 color;\n" diff --git a/tests/shaders/sso-user-varying-01.c b/tests/shaders/sso-user-varying-01.c index b561aaba..99aa628c 100644 --- a/tests/shaders/sso-user-varying-01.c +++ b/tests/shaders/sso-user-varying-01.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "varying vec4 color;\n" diff --git a/tests/shaders/sso-user-varying-02.c b/tests/shaders/sso-user-varying-02.c index 28ec54f3..6b961560 100644 --- a/tests/shaders/sso-user-varying-02.c +++ b/tests/shaders/sso-user-varying-02.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "varying vec4 color;\n" diff --git a/tests/shaders/trinity-fp1.c b/tests/shaders/trinity-fp1.c index 46bee559..17adb806 100644 --- a/tests/shaders/trinity-fp1.c +++ b/tests/shaders/trinity-fp1.c @@ -31,7 +31,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) static GLuint TexDiffuse = 1; static GLuint TexNormal = 2; diff --git a/tests/shaders/useprogram-flushverts-1.c b/tests/shaders/useprogram-flushverts-1.c index 8f408969..e3d67c85 100644 --- a/tests/shaders/useprogram-flushverts-1.c +++ b/tests/shaders/useprogram-flushverts-1.c @@ -36,7 +36,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 GLint prog1, prog2; diff --git a/tests/shaders/useprogram-flushverts-2.c b/tests/shaders/useprogram-flushverts-2.c index fd859e94..c8a2250b 100644 --- a/tests/shaders/useprogram-flushverts-2.c +++ b/tests/shaders/useprogram-flushverts-2.c @@ -36,7 +36,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 GLint prog1, prog2; diff --git a/tests/shaders/useprogram-inside-begin.c b/tests/shaders/useprogram-inside-begin.c index ae8b6d00..a18ce2b7 100644 --- a/tests/shaders/useprogram-inside-begin.c +++ b/tests/shaders/useprogram-inside-begin.c @@ -32,7 +32,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 vs_text[] = "void main() { gl_Position = gl_Vertex; }"; diff --git a/tests/shaders/useprogram-refcount-1.c b/tests/shaders/useprogram-refcount-1.c index 4ff7db95..62c5ca4e 100644 --- a/tests/shaders/useprogram-refcount-1.c +++ b/tests/shaders/useprogram-refcount-1.c @@ -39,7 +39,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 GLint prog; diff --git a/tests/shaders/useshaderprogram-bad-program.c b/tests/shaders/useshaderprogram-bad-program.c index 9a90e38a..cfd88a5e 100644 --- a/tests/shaders/useshaderprogram-bad-program.c +++ b/tests/shaders/useshaderprogram-bad-program.c @@ -32,7 +32,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 bad_vs_text[] = "vec4 my_ftransform(void);\n" diff --git a/tests/shaders/useshaderprogram-bad-type.c b/tests/shaders/useshaderprogram-bad-type.c index 96903039..c1c087f2 100644 --- a/tests/shaders/useshaderprogram-bad-type.c +++ b/tests/shaders/useshaderprogram-bad-type.c @@ -32,7 +32,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/shaders/useshaderprogram-flushverts-1.c b/tests/shaders/useshaderprogram-flushverts-1.c index e72a1500..51428db6 100644 --- a/tests/shaders/useshaderprogram-flushverts-1.c +++ b/tests/shaders/useshaderprogram-flushverts-1.c @@ -36,7 +36,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 GLint vs_prog, fs_prog_1, fs_prog_2; diff --git a/tests/shaders/vp-address-01.c b/tests/shaders/vp-address-01.c index 635ea327..d1ea4517 100644 --- a/tests/shaders/vp-address-01.c +++ b/tests/shaders/vp-address-01.c @@ -46,7 +46,7 @@ static const GLfloat attrib[] = { PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-address-02.c b/tests/shaders/vp-address-02.c index 12045c29..8a9441ad 100644 --- a/tests/shaders/vp-address-02.c +++ b/tests/shaders/vp-address-02.c @@ -56,7 +56,7 @@ static const GLfloat attrib[] = { PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-address-03.c b/tests/shaders/vp-address-03.c index 6e6f40b3..61597c0e 100644 --- a/tests/shaders/vp-address-03.c +++ b/tests/shaders/vp-address-03.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-address-04.c b/tests/shaders/vp-address-04.c index 2296a9b6..ff0edcad 100644 --- a/tests/shaders/vp-address-04.c +++ b/tests/shaders/vp-address-04.c @@ -75,7 +75,7 @@ static const GLfloat attrib[] = { PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-address-05.c b/tests/shaders/vp-address-05.c index 5e90147c..f502f0dc 100644 --- a/tests/shaders/vp-address-05.c +++ b/tests/shaders/vp-address-05.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-address-06.c b/tests/shaders/vp-address-06.c index 3e5fa673..093ffcb7 100644 --- a/tests/shaders/vp-address-06.c +++ b/tests/shaders/vp-address-06.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-bad-program.c b/tests/shaders/vp-bad-program.c index c73982b2..f6ec9a9f 100644 --- a/tests/shaders/vp-bad-program.c +++ b/tests/shaders/vp-bad-program.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) enum piglit_result piglit_display(void) diff --git a/tests/shaders/vp-clipdistance-01.c b/tests/shaders/vp-clipdistance-01.c index 8a36908b..028f05e1 100644 --- a/tests/shaders/vp-clipdistance-01.c +++ b/tests/shaders/vp-clipdistance-01.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-clipdistance-02.c b/tests/shaders/vp-clipdistance-02.c index 1d016d55..429c3863 100644 --- a/tests/shaders/vp-clipdistance-02.c +++ b/tests/shaders/vp-clipdistance-02.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-clipdistance-03.c b/tests/shaders/vp-clipdistance-03.c index ff11034e..a8c9e20a 100644 --- a/tests/shaders/vp-clipdistance-03.c +++ b/tests/shaders/vp-clipdistance-03.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-clipdistance-04.c b/tests/shaders/vp-clipdistance-04.c index 793dc797..467a92fa 100644 --- a/tests/shaders/vp-clipdistance-04.c +++ b/tests/shaders/vp-clipdistance-04.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( (((BOX_SIZE+1)*TEST_COLS)+1) /*window_width*/, (((BOX_SIZE+1)*TEST_ROWS)+1) /*window_height*/, - GLUT_DOUBLE) + PIGLIT_GL_VISUAL_DOUBLE) static const char vertex_source_template[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vp-combined-image-units.c b/tests/shaders/vp-combined-image-units.c index 3cbb41bd..9cb0c484 100644 --- a/tests/shaders/vp-combined-image-units.c +++ b/tests/shaders/vp-combined-image-units.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/shaders/vp-ignore-input.c b/tests/shaders/vp-ignore-input.c index 4d90ec98..62589fac 100644 --- a/tests/shaders/vp-ignore-input.c +++ b/tests/shaders/vp-ignore-input.c @@ -33,7 +33,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/shaders/vp-max-array.c b/tests/shaders/vp-max-array.c index 8dc3880a..eebd0f50 100644 --- a/tests/shaders/vp-max-array.c +++ b/tests/shaders/vp-max-array.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static const char template_header[] = "!!ARBvp1.0\n" diff --git a/tests/shaders/vpfp-generic.cpp b/tests/shaders/vpfp-generic.cpp index 239b8202..0184b605 100644 --- a/tests/shaders/vpfp-generic.cpp +++ b/tests/shaders/vpfp-generic.cpp @@ -169,7 +169,7 @@ private: PIGLIT_GL_TEST_MAIN(100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char* Filename = 0; static TestGroup tests; diff --git a/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c b/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c index 8adca21d..506d83c1 100644 --- a/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c +++ b/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c @@ -24,7 +24,7 @@ PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, 70 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const float colors[6][3] = { {1, 0, 0}, diff --git a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c index 33987b14..01ebf36a 100644 --- a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c +++ b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c @@ -32,7 +32,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/spec/arb_blend_func_extended/api/blend-api.c b/tests/spec/arb_blend_func_extended/api/blend-api.c index c7933b83..276ce70a 100644 --- a/tests/spec/arb_blend_func_extended/api/blend-api.c +++ b/tests/spec/arb_blend_func_extended/api/blend-api.c @@ -31,7 +31,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/spec/arb_blend_func_extended/api/error-at-begin.c b/tests/spec/arb_blend_func_extended/api/error-at-begin.c index 6bdbb8ec..a73fe604 100644 --- a/tests/spec/arb_blend_func_extended/api/error-at-begin.c +++ b/tests/spec/arb_blend_func_extended/api/error-at-begin.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/spec/arb_blend_func_extended/api/getfragdataindex.c b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c index 733404c6..7fedf9de 100644 --- a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c +++ b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c @@ -31,7 +31,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 *vs_text = "#version 130\n" diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c index bbb3d83a..e789bb17 100644 --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static const char *TestName = "fbo-extended-blend-explicit"; diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c index 558b3c30..ddea5a95 100644 --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static const char *TestName = "fbo-extended-blend"; diff --git a/tests/spec/arb_color_buffer_float/common.h b/tests/spec/arb_color_buffer_float/common.h index f71077c0..6d3386a0 100644 --- a/tests/spec/arb_color_buffer_float/common.h +++ b/tests/spec/arb_color_buffer_float/common.h @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN(128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) /* use small values for pixels[0..3], so that the 0.01 tolerance is met for fp16 */ static float pixels[] = { diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c index 76564f8b..e219e29e 100644 --- a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c +++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c @@ -34,7 +34,7 @@ uint8_t dest_data[COPY_BUFFER_SIZE]; PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 300 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_copy_buffer/copybuffersubdata.c b/tests/spec/arb_copy_buffer/copybuffersubdata.c index 5f61a39e..e4e17dc7 100644 --- a/tests/spec/arb_copy_buffer/copybuffersubdata.c +++ b/tests/spec/arb_copy_buffer/copybuffersubdata.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 bool test_copy(void) diff --git a/tests/spec/arb_copy_buffer/dlist.c b/tests/spec/arb_copy_buffer/dlist.c index 288f2297..3f6b5a55 100644 --- a/tests/spec/arb_copy_buffer/dlist.c +++ b/tests/spec/arb_copy_buffer/dlist.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/spec/arb_copy_buffer/get.c b/tests/spec/arb_copy_buffer/get.c index 099846ea..938aa333 100644 --- a/tests/spec/arb_copy_buffer/get.c +++ b/tests/spec/arb_copy_buffer/get.c @@ -31,7 +31,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/spec/arb_copy_buffer/negative-bound-zero.c b/tests/spec/arb_copy_buffer/negative-bound-zero.c index 0746b90e..a8b82b18 100644 --- a/tests/spec/arb_copy_buffer/negative-bound-zero.c +++ b/tests/spec/arb_copy_buffer/negative-bound-zero.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) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_copy_buffer/negative-bounds.c b/tests/spec/arb_copy_buffer/negative-bounds.c index c4208e77..3f2c4f37 100644 --- a/tests/spec/arb_copy_buffer/negative-bounds.c +++ b/tests/spec/arb_copy_buffer/negative-bounds.c @@ -40,7 +40,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/spec/arb_copy_buffer/negative-mapped.c b/tests/spec/arb_copy_buffer/negative-mapped.c index fe65338d..acfdf3c4 100644 --- a/tests/spec/arb_copy_buffer/negative-mapped.c +++ b/tests/spec/arb_copy_buffer/negative-mapped.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) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_copy_buffer/overlap.c b/tests/spec/arb_copy_buffer/overlap.c index b61688b5..7ddf70b7 100644 --- a/tests/spec/arb_copy_buffer/overlap.c +++ b/tests/spec/arb_copy_buffer/overlap.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static void test_copy(GLenum usage, int data_size, int src, int dst, int size) diff --git a/tests/spec/arb_copy_buffer/targets.c b/tests/spec/arb_copy_buffer/targets.c index 3a6025fd..30cba2cf 100644 --- a/tests/spec/arb_copy_buffer/targets.c +++ b/tests/spec/arb_copy_buffer/targets.c @@ -50,7 +50,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/spec/arb_debug_output/api_error.c b/tests/spec/arb_debug_output/api_error.c index 3ea9634f..a9500c0e 100644 --- a/tests/spec/arb_debug_output/api_error.c +++ b/tests/spec/arb_debug_output/api_error.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) #define USER_PARAM ((void*)(intptr_t)12345678) diff --git a/tests/spec/arb_draw_buffers/state_change.c b/tests/spec/arb_draw_buffers/state_change.c index 17a8a13a..a52da0bd 100644 --- a/tests/spec/arb_draw_buffers/state_change.c +++ b/tests/spec/arb_draw_buffers/state_change.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static void check_fbo_status(void) diff --git a/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c b/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c index 11c0df56..4eb6d180 100644 --- a/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c +++ b/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c @@ -56,7 +56,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c b/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c index 8b88f564..8ac37b58 100644 --- a/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c +++ b/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.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) #define NUM_QUADS 10 diff --git a/tests/spec/arb_draw_instanced/execution/dlist.c b/tests/spec/arb_draw_instanced/execution/dlist.c index 331f93f7..7718c983 100644 --- a/tests/spec/arb_draw_instanced/execution/dlist.c +++ b/tests/spec/arb_draw_instanced/execution/dlist.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_draw_instanced/execution/elements.c b/tests/spec/arb_draw_instanced/execution/elements.c index daa71d9f..a939bd5c 100644 --- a/tests/spec/arb_draw_instanced/execution/elements.c +++ b/tests/spec/arb_draw_instanced/execution/elements.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char *vs_source = "#version 120\n" diff --git a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c index de8e8a2c..547b75db 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c +++ b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c index 878bbd4c..ed2f1af7 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c +++ b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c index d099b937..b6347c63 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c @@ -32,7 +32,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/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c index b796ba9c..7209c589 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.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) static GLuint attach_texture(int i) 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 bb696055..92c6da75 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 @@ -28,7 +28,7 @@ PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, 250 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) static unsigned verts[4*4*4]; 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 5d8f95db..3764f601 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) enum piglit_result piglit_display(void) 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 139c9154..b2e63638 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c @@ -31,7 +31,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/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c index e8c5bd02..509dbab9 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c @@ -36,7 +36,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) #ifdef GL_ARB_ES2_compatibility static const char vs_text[] = 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 f0e1dc27..1aa4cd55 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c @@ -32,7 +32,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/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c index 6247e9d8..572efe22 100644 --- a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c +++ b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c @@ -59,7 +59,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c index 2f362b07..9232b8cb 100644 --- a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c +++ b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_fragment_program/minmax.c b/tests/spec/arb_fragment_program/minmax.c index dbb9b3e7..3b6572e4 100644 --- a/tests/spec/arb_fragment_program/minmax.c +++ b/tests/spec/arb_fragment_program/minmax.c @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c b/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c index eb951bc5..e79a1845 100644 --- a/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c +++ b/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c @@ -57,7 +57,7 @@ PIGLIT_GL_TEST_MAIN( 32, 32, - GLUT_RGBA); + PIGLIT_GL_VISUAL_RGBA); enum { TEST_MODE_DRAW, diff --git a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c index 3b9bf1be..c48a6c90 100644 --- a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c +++ b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) enum piglit_result piglit_display() diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c index e9de8a42..79a9ae8b 100644 --- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c +++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 200 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) const char* get_attachment_string(GLint attach) diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c index 5c69898d..c92c4b55 100644 --- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c +++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 200 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) const char* get_attachment_string(GLint attach) diff --git a/tests/spec/arb_framebuffer_srgb/pushpop.c b/tests/spec/arb_framebuffer_srgb/pushpop.c index 8fb639da..dc73d4db 100644 --- a/tests/spec/arb_framebuffer_srgb/pushpop.c +++ b/tests/spec/arb_framebuffer_srgb/pushpop.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_instanced_arrays/instanced_arrays.c b/tests/spec/arb_instanced_arrays/instanced_arrays.c index a0fe4129..f1919381 100644 --- a/tests/spec/arb_instanced_arrays/instanced_arrays.c +++ b/tests/spec/arb_instanced_arrays/instanced_arrays.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-arrays"; 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 f09c4a4a..0cbacf38 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 @@ -31,7 +31,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/spec/arb_map_buffer_range/map_buffer_range_test.c b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c index d23f556e..0716edd6 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 @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) uint8_t data[1 << 20]; diff --git a/tests/spec/arb_multisample/beginend.c b/tests/spec/arb_multisample/beginend.c index bdcc02e8..b66f7115 100644 --- a/tests/spec/arb_multisample/beginend.c +++ b/tests/spec/arb_multisample/beginend.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_multisample/pushpop.c b/tests/spec/arb_multisample/pushpop.c index 35aa605a..aa412de1 100644 --- a/tests/spec/arb_multisample/pushpop.c +++ b/tests/spec/arb_multisample/pushpop.c @@ -54,7 +54,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_robustness/client-mem-bounds.c b/tests/spec/arb_robustness/client-mem-bounds.c index 39377225..042cb3a0 100644 --- a/tests/spec/arb_robustness/client-mem-bounds.c +++ b/tests/spec/arb_robustness/client-mem-bounds.c @@ -26,7 +26,7 @@ PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, 320 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) #define width (10) #define height (12) diff --git a/tests/spec/arb_robustness/draw-vbo-bounds.c b/tests/spec/arb_robustness/draw-vbo-bounds.c index cd5e22f1..22b045cb 100644 --- a/tests/spec/arb_robustness/draw-vbo-bounds.c +++ b/tests/spec/arb_robustness/draw-vbo-bounds.c @@ -50,7 +50,7 @@ PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, 320 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) void piglit_init(int argc, char **argv) { diff --git a/tests/spec/arb_sampler_objects/framebufferblit.c b/tests/spec/arb_sampler_objects/framebufferblit.c index 162525ca..60386c3b 100644 --- a/tests/spec/arb_sampler_objects/framebufferblit.c +++ b/tests/spec/arb_sampler_objects/framebufferblit.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, 16 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_sampler_objects/sampler-incomplete.c b/tests/spec/arb_sampler_objects/sampler-incomplete.c index 2b17a53d..00f6a514 100644 --- a/tests/spec/arb_sampler_objects/sampler-incomplete.c +++ b/tests/spec/arb_sampler_objects/sampler-incomplete.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static void setup(void) diff --git a/tests/spec/arb_sampler_objects/sampler-objects.c b/tests/spec/arb_sampler_objects/sampler-objects.c index 28024458..9615c398 100644 --- a/tests/spec/arb_sampler_objects/sampler-objects.c +++ b/tests/spec/arb_sampler_objects/sampler-objects.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const char *Prog = "sampler-objects"; diff --git a/tests/spec/arb_sampler_objects/srgb-decode.c b/tests/spec/arb_sampler_objects/srgb-decode.c index 871d2977..0cc7dbed 100644 --- a/tests/spec/arb_sampler_objects/srgb-decode.c +++ b/tests/spec/arb_sampler_objects/srgb-decode.c @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, 16 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static bool test_getter(GLuint sampler) diff --git a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c index 63de8de9..053d4fa3 100644 --- a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c +++ b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c @@ -24,7 +24,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 40 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const float colors[6][3] = { {1, 0, 0}, diff --git a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c index d5a675fb..2c6eadcb 100644 --- a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c +++ b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const GLchar *vertShaderText = "attribute vec4 attrib;\n" diff --git a/tests/spec/arb_shader_objects/clear-with-deleted.c b/tests/spec/arb_shader_objects/clear-with-deleted.c index 833dcc8a..d234191d 100644 --- a/tests/spec/arb_shader_objects/clear-with-deleted.c +++ b/tests/spec/arb_shader_objects/clear-with-deleted.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char *vs_source = "void main()\n" diff --git a/tests/spec/arb_shader_objects/delete-repeat.c b/tests/spec/arb_shader_objects/delete-repeat.c index f4497de2..b87718c4 100644 --- a/tests/spec/arb_shader_objects/delete-repeat.c +++ b/tests/spec/arb_shader_objects/delete-repeat.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char *vs_source = "void main()\n" diff --git a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c index 31771702..9bfacef9 100644 --- a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c +++ b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_shader_objects/getuniform.c b/tests/spec/arb_shader_objects/getuniform.c index a69a2589..e81a4e2f 100644 --- a/tests/spec/arb_shader_objects/getuniform.c +++ b/tests/spec/arb_shader_objects/getuniform.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c index b4abe3cd..0c684c0e 100644 --- a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c +++ b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.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 *vs_code = "struct S { mat4 m; vec4 v[10]; };\n" diff --git a/tests/spec/arb_shader_texture_lod/execution/texgrad.c b/tests/spec/arb_shader_texture_lod/execution/texgrad.c index 7086ac1d..d8dd4554 100644 --- a/tests/spec/arb_shader_texture_lod/execution/texgrad.c +++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 256 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/spec/arb_sync/repeat-wait.c b/tests/spec/arb_sync/repeat-wait.c index a812824b..a0f3d782 100644 --- a/tests/spec/arb_sync/repeat-wait.c +++ b/tests/spec/arb_sync/repeat-wait.c @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) #define ONE_SECOND 1000000 diff --git a/tests/spec/arb_sync/timeout-zero.c b/tests/spec/arb_sync/timeout-zero.c index 4e162ba9..b3fefba6 100644 --- a/tests/spec/arb_sync/timeout-zero.c +++ b/tests/spec/arb_sync/timeout-zero.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) #define ONE_SECOND 1000000 diff --git a/tests/spec/arb_texture_buffer_object/dlist.c b/tests/spec/arb_texture_buffer_object/dlist.c index dd8e62df..4faffda6 100644 --- a/tests/spec/arb_texture_buffer_object/dlist.c +++ b/tests/spec/arb_texture_buffer_object/dlist.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_buffer_object/formats.c b/tests/spec/arb_texture_buffer_object/formats.c index 8e2511b9..3e85dad8 100644 --- a/tests/spec/arb_texture_buffer_object/formats.c +++ b/tests/spec/arb_texture_buffer_object/formats.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 500 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum channels { A, diff --git a/tests/spec/arb_texture_buffer_object/get.c b/tests/spec/arb_texture_buffer_object/get.c index ffbc4e13..e2f87664 100644 --- a/tests/spec/arb_texture_buffer_object/get.c +++ b/tests/spec/arb_texture_buffer_object/get.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_buffer_object/minmax.c b/tests/spec/arb_texture_buffer_object/minmax.c index 22399c42..ba304759 100644 --- a/tests/spec/arb_texture_buffer_object/minmax.c +++ b/tests/spec/arb_texture_buffer_object/minmax.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c index c1a2f748..9abc00d8 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-format.c b/tests/spec/arb_texture_buffer_object/negative-bad-format.c index 60171217..c959183f 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-format.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-format.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-target.c b/tests/spec/arb_texture_buffer_object/negative-bad-target.c index 3885cd71..c6391dd7 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-target.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-target.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_buffer_object/unused-name.c b/tests/spec/arb_texture_buffer_object/unused-name.c index 9f0b77a4..93825119 100644 --- a/tests/spec/arb_texture_buffer_object/unused-name.c +++ b/tests/spec/arb_texture_buffer_object/unused-name.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_compression/internal-format-query.c b/tests/spec/arb_texture_compression/internal-format-query.c index 9f29f6ed..fa5d7ee3 100644 --- a/tests/spec/arb_texture_compression/internal-format-query.c +++ b/tests/spec/arb_texture_compression/internal-format-query.c @@ -73,7 +73,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) #define ENUM_AND_STRING(e) \ # e, e diff --git a/tests/spec/arb_texture_compression/invalid-formats.c b/tests/spec/arb_texture_compression/invalid-formats.c index 7023aa8b..f7b3ee6e 100644 --- a/tests/spec/arb_texture_compression/invalid-formats.c +++ b/tests/spec/arb_texture_compression/invalid-formats.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) #define ENUM_AND_STRING(e) \ # e, e diff --git a/tests/spec/arb_texture_cube_map_array/cubemap.c b/tests/spec/arb_texture_cube_map_array/cubemap.c index 828f1cf7..55c44b0c 100644 --- a/tests/spec/arb_texture_cube_map_array/cubemap.c +++ b/tests/spec/arb_texture_cube_map_array/cubemap.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( (64 * 6 + PAD * 9) * 2 /*window_width*/, 400*NUM_LAYERS /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) int max_size; diff --git a/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c b/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c index 68f987fa..6d0bce97 100644 --- a/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c +++ b/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) #define NUM_FACES 6 #define NUM_LAYERS 3 diff --git a/tests/spec/arb_texture_cube_map_array/get.c b/tests/spec/arb_texture_cube_map_array/get.c index 20dc6025..a55dd5e8 100644 --- a/tests/spec/arb_texture_cube_map_array/get.c +++ b/tests/spec/arb_texture_cube_map_array/get.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c b/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c index e0a503d5..5fbef71e 100644 --- a/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c +++ b/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.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 GLuint tex; static GLint prog; diff --git a/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c b/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c index dec8f8a4..98202b29 100644 --- a/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c +++ b/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_float/texture-float-formats.c b/tests/spec/arb_texture_float/texture-float-formats.c index a0c8bba9..1ec7f571 100644 --- a/tests/spec/arb_texture_float/texture-float-formats.c +++ b/tests/spec/arb_texture_float/texture-float-formats.c @@ -31,7 +31,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 = "texture-float-formats"; static GLint TexWidth = 16, TexHeight = 16; diff --git a/tests/spec/arb_texture_storage/texture-storage.c b/tests/spec/arb_texture_storage/texture-storage.c index 9bd1c746..00a7769d 100644 --- a/tests/spec/arb_texture_storage/texture-storage.c +++ b/tests/spec/arb_texture_storage/texture-storage.c @@ -33,7 +33,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 = "texture-storage"; diff --git a/tests/spec/arb_timer_query/timestamp-get.c b/tests/spec/arb_timer_query/timestamp-get.c index 398f64a2..14b526db 100644 --- a/tests/spec/arb_timer_query/timestamp-get.c +++ b/tests/spec/arb_timer_query/timestamp-get.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLint64 get_gpu_time_via_query(GLuint q) diff --git a/tests/spec/arb_transform_feedback2/draw-auto.c b/tests/spec/arb_transform_feedback2/draw-auto.c index 1ebed2ec..d056474d 100644 --- a/tests/spec/arb_transform_feedback2/draw-auto.c +++ b/tests/spec/arb_transform_feedback2/draw-auto.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 128 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char *vstext = { "void main() {" diff --git a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c index c64395ee..03ca9c6a 100644 --- a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c +++ b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/buffer-targets.c b/tests/spec/arb_uniform_buffer_object/buffer-targets.c index 556223a2..cd4a7e78 100644 --- a/tests/spec/arb_uniform_buffer_object/buffer-targets.c +++ b/tests/spec/arb_uniform_buffer_object/buffer-targets.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/deletebuffers.c b/tests/spec/arb_uniform_buffer_object/deletebuffers.c index cc788dc4..94a874d6 100644 --- a/tests/spec/arb_uniform_buffer_object/deletebuffers.c +++ b/tests/spec/arb_uniform_buffer_object/deletebuffers.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/dlist.c b/tests/spec/arb_uniform_buffer_object/dlist.c index a4a020da..ef816315 100644 --- a/tests/spec/arb_uniform_buffer_object/dlist.c +++ b/tests/spec/arb_uniform_buffer_object/dlist.c @@ -57,7 +57,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) const char *source = "#extension GL_ARB_uniform_buffer_object : enable\n" diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformblockiv-uniform-block-data-size.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformblockiv-uniform-block-data-size.c index 06a88d9c..40dbfdee 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformblockiv-uniform-block-data-size.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformblockiv-uniform-block-data-size.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) static int align(int v, int a) diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformblockname.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformblockname.c index 3208a19b..28a179d6 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformblockname.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformblockname.c @@ -69,7 +69,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformname.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformname.c index 83a508a9..1327991e 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformname.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformname.c @@ -69,7 +69,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-array-stride.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-array-stride.c index 4b50939b..6b0583a2 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-array-stride.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-array-stride.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char fs_source[] = "#extension GL_ARB_uniform_buffer_object : require\n" diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c index 9fe0ddf4..884d6bad 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char vs_source[] = "#extension GL_ARB_uniform_buffer_object : require\n" diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c index c7db92a8..eeef2c20 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char fs_source[] = "#extension GL_ARB_uniform_buffer_object : require\n" diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-type.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-type.c index ecff027d..68069e5d 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-type.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-type.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static bool test_format(const struct uniform_type *type) diff --git a/tests/spec/arb_uniform_buffer_object/getintegeri_v.c b/tests/spec/arb_uniform_buffer_object/getintegeri_v.c index 852a14eb..9d3d7ab9 100644 --- a/tests/spec/arb_uniform_buffer_object/getintegeri_v.c +++ b/tests/spec/arb_uniform_buffer_object/getintegeri_v.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) static bool pass = true; diff --git a/tests/spec/arb_uniform_buffer_object/getprogramiv.c b/tests/spec/arb_uniform_buffer_object/getprogramiv.c index a5c5f24c..4befc37f 100644 --- a/tests/spec/arb_uniform_buffer_object/getprogramiv.c +++ b/tests/spec/arb_uniform_buffer_object/getprogramiv.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) struct { const char *source; diff --git a/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c b/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c index a7cb57bf..732b2a12 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLuint prog; diff --git a/tests/spec/arb_uniform_buffer_object/getuniformindices.c b/tests/spec/arb_uniform_buffer_object/getuniformindices.c index 646002e5..e3c89e8d 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformindices.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformindices.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLuint prog; diff --git a/tests/spec/arb_uniform_buffer_object/getuniformlocation.c b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c index 8f0245d3..13b86b61 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformlocation.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLuint prog; diff --git a/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c b/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c index 5841c035..c6a918df 100644 --- a/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c +++ b/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static int align(int v, int a) diff --git a/tests/spec/arb_uniform_buffer_object/layout-std140.c b/tests/spec/arb_uniform_buffer_object/layout-std140.c index 429b5740..eeb20835 100644 --- a/tests/spec/arb_uniform_buffer_object/layout-std140.c +++ b/tests/spec/arb_uniform_buffer_object/layout-std140.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLuint prog; diff --git a/tests/spec/arb_uniform_buffer_object/link-mismatch-blocks.c b/tests/spec/arb_uniform_buffer_object/link-mismatch-blocks.c index a8573aa3..c7a413c5 100644 --- a/tests/spec/arb_uniform_buffer_object/link-mismatch-blocks.c +++ b/tests/spec/arb_uniform_buffer_object/link-mismatch-blocks.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) struct test { const char *a_header; diff --git a/tests/spec/arb_uniform_buffer_object/maxblocks.c b/tests/spec/arb_uniform_buffer_object/maxblocks.c index b28cc2df..832e71cc 100644 --- a/tests/spec/arb_uniform_buffer_object/maxblocks.c +++ b/tests/spec/arb_uniform_buffer_object/maxblocks.c @@ -50,7 +50,7 @@ PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) static char * get_shader(GLenum target, const char *block_prefix, int blocks) diff --git a/tests/spec/arb_uniform_buffer_object/minmax.c b/tests/spec/arb_uniform_buffer_object/minmax.c index 590f2a7c..e864ba7a 100644 --- a/tests/spec/arb_uniform_buffer_object/minmax.c +++ b/tests/spec/arb_uniform_buffer_object/minmax.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c index 185c373e..246645c7 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c index 8f7c4a1e..dc6f87d0 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c index e884040d..347a4660 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c b/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c index cb5ecdea..c814fd3f 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c index 0f1e5f73..0a811a79 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c +++ b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c @@ -53,7 +53,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformsiv.c b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformsiv.c index 6e2eda04..94781398 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformsiv.c +++ b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformsiv.c @@ -54,7 +54,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/referenced-by-shader.c b/tests/spec/arb_uniform_buffer_object/referenced-by-shader.c index 44801961..a80c434b 100644 --- a/tests/spec/arb_uniform_buffer_object/referenced-by-shader.c +++ b/tests/spec/arb_uniform_buffer_object/referenced-by-shader.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_uniform_buffer_object/row-major.c b/tests/spec/arb_uniform_buffer_object/row-major.c index 9c253be1..591055ac 100644 --- a/tests/spec/arb_uniform_buffer_object/row-major.c +++ b/tests/spec/arb_uniform_buffer_object/row-major.c @@ -53,7 +53,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) static const char *source = "#extension GL_ARB_uniform_buffer_object : enable\n" diff --git a/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c b/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c index 12c67342..ce6e5682 100644 --- a/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c +++ b/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c @@ -61,7 +61,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c index 6109acdd..7b24e952 100644 --- a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c +++ b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c @@ -33,7 +33,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) static GLuint vbo; diff --git a/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c b/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c index d6648a6b..2fe93d49 100644 --- a/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c +++ b/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.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) static GLuint vbo; diff --git a/tests/spec/arb_vertex_program/getenv4d-with-error.c b/tests/spec/arb_vertex_program/getenv4d-with-error.c index 6bdfc7cb..baa976f1 100644 --- a/tests/spec/arb_vertex_program/getenv4d-with-error.c +++ b/tests/spec/arb_vertex_program/getenv4d-with-error.c @@ -33,7 +33,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) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_vertex_program/getlocal4d-with-error.c b/tests/spec/arb_vertex_program/getlocal4d-with-error.c index 243fd4f9..b1fef839 100644 --- a/tests/spec/arb_vertex_program/getlocal4d-with-error.c +++ b/tests/spec/arb_vertex_program/getlocal4d-with-error.c @@ -33,7 +33,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) void piglit_init(int argc, char **argv) diff --git a/tests/spec/arb_vertex_program/minmax.c b/tests/spec/arb_vertex_program/minmax.c index 461d1733..3a7bc2f6 100644 --- a/tests/spec/arb_vertex_program/minmax.c +++ b/tests/spec/arb_vertex_program/minmax.c @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) 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 03236990..3e2e70f5 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 @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, 60 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define i32to10(x) ((x) >= 0 ? (x & 0x1ff) : 1024-(abs((x))& 0x1ff)) #define i32to2(x) ((x) >= 0 ? (x & 0x1) : 1-abs((x))) diff --git a/tests/spec/ati_draw_buffers/arbfp-no-index.c b/tests/spec/ati_draw_buffers/arbfp-no-index.c index e29ed51f..ce197120 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-index.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-index.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static float result0[] = {0.7, 0.6, 0.3, 0.1}; static float result1[] = {0.2, 0.9, 0.5, 0.8}; diff --git a/tests/spec/ati_draw_buffers/arbfp-no-option.c b/tests/spec/ati_draw_buffers/arbfp-no-option.c index 4b655ba9..4e44bebf 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-option.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-option.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static const char *mrt_fp_string = "!!ARBfp1.0\n" diff --git a/tests/spec/ati_draw_buffers/arbfp.c b/tests/spec/ati_draw_buffers/arbfp.c index 12d8d7df..1df1bc1b 100644 --- a/tests/spec/ati_draw_buffers/arbfp.c +++ b/tests/spec/ati_draw_buffers/arbfp.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static float result0[] = {0.7, 0.6, 0.3, 0.1}; static float result1[] = {0.2, 0.9, 0.5, 0.8}; diff --git a/tests/spec/ati_envmap_bumpmap/bump.c b/tests/spec/ati_envmap_bumpmap/bump.c index 0590f9d6..cfea0514 100644 --- a/tests/spec/ati_envmap_bumpmap/bump.c +++ b/tests/spec/ati_envmap_bumpmap/bump.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( TEXSIZE * 2 /*window_width*/, TEXSIZE * 2 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static GLenum tex_unit, bump_unit; diff --git a/tests/spec/ext_fog_coord/modes.c b/tests/spec/ext_fog_coord/modes.c index 34adf8d4..a6f3e9af 100644 --- a/tests/spec/ext_fog_coord/modes.c +++ b/tests/spec/ext_fog_coord/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/spec/ext_framebuffer_multisample/accuracy.cpp b/tests/spec/ext_framebuffer_multisample/accuracy.cpp index 7e52e0f0..5ded0197 100644 --- a/tests/spec/ext_framebuffer_multisample/accuracy.cpp +++ b/tests/spec/ext_framebuffer_multisample/accuracy.cpp @@ -47,7 +47,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) const int pattern_width = 256; const int pattern_height = 256; const int supersample_factor = 16; diff --git a/tests/spec/ext_framebuffer_multisample/alpha-blending.c b/tests/spec/ext_framebuffer_multisample/alpha-blending.c index 013def3c..66b5c398 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-blending.c +++ b/tests/spec/ext_framebuffer_multisample/alpha-blending.c @@ -44,7 +44,7 @@ int numSamples; PIGLIT_GL_TEST_MAIN( WIDTH, HEIGHT, - GLUT_DOUBLE| GLUT_RGBA | GLUT_ALPHA); + PIGLIT_GL_VISUAL_DOUBLE| PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA); void piglit_init(int argc, char **argv) diff --git a/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-dual-src-blend.cpp b/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-dual-src-blend.cpp index 5f8db5d7..07d49f12 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-dual-src-blend.cpp +++ b/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-dual-src-blend.cpp @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) void print_usage_and_exit(char *prog_name) { diff --git a/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-no-draw-buffer-zero.cpp b/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-no-draw-buffer-zero.cpp index 18ac8ebc..a6ac0037 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-no-draw-buffer-zero.cpp +++ b/tests/spec/ext_framebuffer_multisample/alpha-to-coverage-no-draw-buffer-zero.cpp @@ -48,7 +48,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 768 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) void print_usage_and_exit(char *prog_name) diff --git a/tests/spec/ext_framebuffer_multisample/alpha-to-one-dual-src-blend.cpp b/tests/spec/ext_framebuffer_multisample/alpha-to-one-dual-src-blend.cpp index 062af05a..3f160210 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-to-one-dual-src-blend.cpp +++ b/tests/spec/ext_framebuffer_multisample/alpha-to-one-dual-src-blend.cpp @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) void print_usage_and_exit(char *prog_name) { diff --git a/tests/spec/ext_framebuffer_multisample/alpha-to-one-msaa-disabled.cpp b/tests/spec/ext_framebuffer_multisample/alpha-to-one-msaa-disabled.cpp index c0e1ea75..a5a95e09 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-to-one-msaa-disabled.cpp +++ b/tests/spec/ext_framebuffer_multisample/alpha-to-one-msaa-disabled.cpp @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) void print_usage_and_exit(char *prog_name) diff --git a/tests/spec/ext_framebuffer_multisample/alpha-to-one-single-sample-buffer.cpp b/tests/spec/ext_framebuffer_multisample/alpha-to-one-single-sample-buffer.cpp index 0919fd3f..b72f633a 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-to-one-single-sample-buffer.cpp +++ b/tests/spec/ext_framebuffer_multisample/alpha-to-one-single-sample-buffer.cpp @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) void piglit_init(int argc, char **argv) diff --git a/tests/spec/ext_framebuffer_multisample/bitmap.cpp b/tests/spec/ext_framebuffer_multisample/bitmap.cpp index cb56f3a1..5e3b050f 100644 --- a/tests/spec/ext_framebuffer_multisample/bitmap.cpp +++ b/tests/spec/ext_framebuffer_multisample/bitmap.cpp @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) const int pattern_width = 256; const int pattern_height = 256; diff --git a/tests/spec/ext_framebuffer_multisample/blit-flipped.cpp b/tests/spec/ext_framebuffer_multisample/blit-flipped.cpp index 4d1250eb..5ce02af8 100644 --- a/tests/spec/ext_framebuffer_multisample/blit-flipped.cpp +++ b/tests/spec/ext_framebuffer_multisample/blit-flipped.cpp @@ -54,7 +54,7 @@ const int pattern_width = 256; const int pattern_height = 256; PIGLIT_GL_TEST_MAIN(pattern_width * 2, pattern_height, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA); + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA); static Fbo multisampled_fbo, singlesampled_fbo; static TestPattern *test_pattern; diff --git a/tests/spec/ext_framebuffer_multisample/blit-mismatched-formats.cpp b/tests/spec/ext_framebuffer_multisample/blit-mismatched-formats.cpp index 4681c5c1..dc410d46 100644 --- a/tests/spec/ext_framebuffer_multisample/blit-mismatched-formats.cpp +++ b/tests/spec/ext_framebuffer_multisample/blit-mismatched-formats.cpp @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN(256 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA); + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA); const int pattern_width = 256; const int pattern_height = 256; Fbo src_fbo, dst_fbo; diff --git a/tests/spec/ext_framebuffer_multisample/blit-mismatched-samples.cpp b/tests/spec/ext_framebuffer_multisample/blit-mismatched-samples.cpp index e9775526..fa8f3f08 100644 --- a/tests/spec/ext_framebuffer_multisample/blit-mismatched-samples.cpp +++ b/tests/spec/ext_framebuffer_multisample/blit-mismatched-samples.cpp @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN(256 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA); + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA); const int pattern_width = 256; const int pattern_height = 256; Fbo src_fbo, dst_fbo; diff --git a/tests/spec/ext_framebuffer_multisample/blit-mismatched-sizes.cpp b/tests/spec/ext_framebuffer_multisample/blit-mismatched-sizes.cpp index b128dfcb..6c78423b 100644 --- a/tests/spec/ext_framebuffer_multisample/blit-mismatched-sizes.cpp +++ b/tests/spec/ext_framebuffer_multisample/blit-mismatched-sizes.cpp @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN(256 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA); + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA); const int pattern_width = 256; const int pattern_height = 256; Fbo src_fbo, dst_fbo; diff --git a/tests/spec/ext_framebuffer_multisample/clear.cpp b/tests/spec/ext_framebuffer_multisample/clear.cpp index 0ca77202..e03f2cbb 100644 --- a/tests/spec/ext_framebuffer_multisample/clear.cpp +++ b/tests/spec/ext_framebuffer_multisample/clear.cpp @@ -63,7 +63,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) namespace { diff --git a/tests/spec/ext_framebuffer_multisample/clip-and-scissor-blit.cpp b/tests/spec/ext_framebuffer_multisample/clip-and-scissor-blit.cpp index 7dc26eef..d7c733ab 100644 --- a/tests/spec/ext_framebuffer_multisample/clip-and-scissor-blit.cpp +++ b/tests/spec/ext_framebuffer_multisample/clip-and-scissor-blit.cpp @@ -59,7 +59,7 @@ PIGLIT_GL_TEST_MAIN( 600 /*window_width*/, 320 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) namespace { diff --git a/tests/spec/ext_framebuffer_multisample/dlist.c b/tests/spec/ext_framebuffer_multisample/dlist.c index 9f4a0558..9041ed0f 100644 --- a/tests/spec/ext_framebuffer_multisample/dlist.c +++ b/tests/spec/ext_framebuffer_multisample/dlist.c @@ -40,7 +40,7 @@ immediately instead of being compiled into display lists. PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/draw-buffers-alpha-to-coverage.cpp b/tests/spec/ext_framebuffer_multisample/draw-buffers-alpha-to-coverage.cpp index 31213f61..857a0568 100644 --- a/tests/spec/ext_framebuffer_multisample/draw-buffers-alpha-to-coverage.cpp +++ b/tests/spec/ext_framebuffer_multisample/draw-buffers-alpha-to-coverage.cpp @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 768 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) void print_usage_and_exit(char *prog_name) diff --git a/tests/spec/ext_framebuffer_multisample/draw-buffers-alpha-to-one.cpp b/tests/spec/ext_framebuffer_multisample/draw-buffers-alpha-to-one.cpp index 53127aa2..c49434a0 100644 --- a/tests/spec/ext_framebuffer_multisample/draw-buffers-alpha-to-one.cpp +++ b/tests/spec/ext_framebuffer_multisample/draw-buffers-alpha-to-one.cpp @@ -66,7 +66,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 768 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) static int samples; diff --git a/tests/spec/ext_framebuffer_multisample/enable-flag.cpp b/tests/spec/ext_framebuffer_multisample/enable-flag.cpp index 10845632..85eeb451 100644 --- a/tests/spec/ext_framebuffer_multisample/enable-flag.cpp +++ b/tests/spec/ext_framebuffer_multisample/enable-flag.cpp @@ -65,7 +65,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA); + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA); namespace { diff --git a/tests/spec/ext_framebuffer_multisample/formats.cpp b/tests/spec/ext_framebuffer_multisample/formats.cpp index f242c991..36d9f0ac 100644 --- a/tests/spec/ext_framebuffer_multisample/formats.cpp +++ b/tests/spec/ext_framebuffer_multisample/formats.cpp @@ -49,7 +49,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) namespace { diff --git a/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-coverage.cpp b/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-coverage.cpp index cfd90e55..b92c9838 100644 --- a/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-coverage.cpp +++ b/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-coverage.cpp @@ -45,7 +45,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 768 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) /* At present fragment shader in draw-buffers-common.cpp supports only * fixed number of attachments = 3. diff --git a/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-one.cpp b/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-one.cpp index 9827db8f..6bb5d91a 100644 --- a/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-one.cpp +++ b/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-one.cpp @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 768 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) /* At present fragment shader supports only fixed number of attachments (3) */ static int num_attachments = 3; diff --git a/tests/spec/ext_framebuffer_multisample/interpolation.cpp b/tests/spec/ext_framebuffer_multisample/interpolation.cpp index 45db66f2..bccb1f5f 100644 --- a/tests/spec/ext_framebuffer_multisample/interpolation.cpp +++ b/tests/spec/ext_framebuffer_multisample/interpolation.cpp @@ -126,7 +126,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) namespace { diff --git a/tests/spec/ext_framebuffer_multisample/line-smooth.cpp b/tests/spec/ext_framebuffer_multisample/line-smooth.cpp index bd4a8252..f2ce36a1 100644 --- a/tests/spec/ext_framebuffer_multisample/line-smooth.cpp +++ b/tests/spec/ext_framebuffer_multisample/line-smooth.cpp @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*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 int pattern_width = 256; const int pattern_height = 256; diff --git a/tests/spec/ext_framebuffer_multisample/minmax.c b/tests/spec/ext_framebuffer_multisample/minmax.c index 7cb515ca..66807c81 100644 --- a/tests/spec/ext_framebuffer_multisample/minmax.c +++ b/tests/spec/ext_framebuffer_multisample/minmax.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/multisample-blit.cpp b/tests/spec/ext_framebuffer_multisample/multisample-blit.cpp index f460bae0..4bb3cfdf 100644 --- a/tests/spec/ext_framebuffer_multisample/multisample-blit.cpp +++ b/tests/spec/ext_framebuffer_multisample/multisample-blit.cpp @@ -38,7 +38,7 @@ */ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*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 int pattern_width = 256; const int pattern_height = 256; diff --git a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c index ff90539f..60bb7865 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c +++ b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c @@ -47,7 +47,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c index ee37bed2..8029abb4 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c +++ b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c @@ -47,7 +47,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c index 6ffe25fb..a24ca3e2 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c +++ b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c b/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c index ab6fea77..787c0e46 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c +++ b/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/negative-readpixels.c b/tests/spec/ext_framebuffer_multisample/negative-readpixels.c index dfc792e3..a6333c4f 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-readpixels.c +++ b/tests/spec/ext_framebuffer_multisample/negative-readpixels.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/no-color.cpp b/tests/spec/ext_framebuffer_multisample/no-color.cpp index b7ded7c2..995c5044 100644 --- a/tests/spec/ext_framebuffer_multisample/no-color.cpp +++ b/tests/spec/ext_framebuffer_multisample/no-color.cpp @@ -76,7 +76,7 @@ PIGLIT_GL_TEST_MAIN( 512 /* window_width */, 256 /* window_height */, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) namespace { diff --git a/tests/spec/ext_framebuffer_multisample/point-smooth.cpp b/tests/spec/ext_framebuffer_multisample/point-smooth.cpp index f2ae5c78..ee936834 100644 --- a/tests/spec/ext_framebuffer_multisample/point-smooth.cpp +++ b/tests/spec/ext_framebuffer_multisample/point-smooth.cpp @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*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 int pattern_width = 256; const int pattern_height = 256; diff --git a/tests/spec/ext_framebuffer_multisample/polygon-smooth.cpp b/tests/spec/ext_framebuffer_multisample/polygon-smooth.cpp index 9be96216..5ef872a9 100644 --- a/tests/spec/ext_framebuffer_multisample/polygon-smooth.cpp +++ b/tests/spec/ext_framebuffer_multisample/polygon-smooth.cpp @@ -45,7 +45,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*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 int pattern_width = 256; const int pattern_height = 256; diff --git a/tests/spec/ext_framebuffer_multisample/polygon-stipple.cpp b/tests/spec/ext_framebuffer_multisample/polygon-stipple.cpp index 8dcd983e..543d6349 100644 --- a/tests/spec/ext_framebuffer_multisample/polygon-stipple.cpp +++ b/tests/spec/ext_framebuffer_multisample/polygon-stipple.cpp @@ -45,7 +45,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) const int pattern_width = 256; const int pattern_height = 256; diff --git a/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c index c04241d8..12acbb3e 100644 --- a/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c +++ b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c @@ -69,7 +69,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c index 692e8b25..c6cf68b4 100644 --- a/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c +++ b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/sample-alpha-to-coverage.cpp b/tests/spec/ext_framebuffer_multisample/sample-alpha-to-coverage.cpp index 38e4ae9e..d3823e0d 100644 --- a/tests/spec/ext_framebuffer_multisample/sample-alpha-to-coverage.cpp +++ b/tests/spec/ext_framebuffer_multisample/sample-alpha-to-coverage.cpp @@ -45,7 +45,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) static GLenum buffer_to_test; diff --git a/tests/spec/ext_framebuffer_multisample/sample-alpha-to-one.cpp b/tests/spec/ext_framebuffer_multisample/sample-alpha-to-one.cpp index 85a08d5f..e3e8d998 100644 --- a/tests/spec/ext_framebuffer_multisample/sample-alpha-to-one.cpp +++ b/tests/spec/ext_framebuffer_multisample/sample-alpha-to-one.cpp @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) void print_usage_and_exit(char *prog_name) diff --git a/tests/spec/ext_framebuffer_multisample/sample-coverage.cpp b/tests/spec/ext_framebuffer_multisample/sample-coverage.cpp index 3172a74b..83c8daac 100644 --- a/tests/spec/ext_framebuffer_multisample/sample-coverage.cpp +++ b/tests/spec/ext_framebuffer_multisample/sample-coverage.cpp @@ -65,7 +65,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) const int pattern_width = 512; const int pattern_height = 128; static Fbo ms_fbo, resolve_fbo; diff --git a/tests/spec/ext_framebuffer_multisample/samples.c b/tests/spec/ext_framebuffer_multisample/samples.c index 3e5eab73..3903f3d2 100644 --- a/tests/spec/ext_framebuffer_multisample/samples.c +++ b/tests/spec/ext_framebuffer_multisample/samples.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_framebuffer_multisample/turn-on-off.cpp b/tests/spec/ext_framebuffer_multisample/turn-on-off.cpp index 0acbd177..656714e4 100644 --- a/tests/spec/ext_framebuffer_multisample/turn-on-off.cpp +++ b/tests/spec/ext_framebuffer_multisample/turn-on-off.cpp @@ -48,7 +48,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) static int num_samples = 0; const int pattern_width = 256; diff --git a/tests/spec/ext_framebuffer_multisample/unaligned-blit.cpp b/tests/spec/ext_framebuffer_multisample/unaligned-blit.cpp index b84c14d1..bfe2ff6f 100644 --- a/tests/spec/ext_framebuffer_multisample/unaligned-blit.cpp +++ b/tests/spec/ext_framebuffer_multisample/unaligned-blit.cpp @@ -55,7 +55,7 @@ const int num_tiles = tiles_across * tiles_across; PIGLIT_GL_TEST_MAIN(2 * pattern_size /*window_width*/, pattern_size /*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 int permutation[num_tiles] = { 10, 5, 6, 17, 3, 11, 16, 21, 14, 24, 23, 8, 15, 18, 0, 12, 9, diff --git a/tests/spec/ext_framebuffer_multisample/upsample.cpp b/tests/spec/ext_framebuffer_multisample/upsample.cpp index b1b0b43a..4bef055e 100644 --- a/tests/spec/ext_framebuffer_multisample/upsample.cpp +++ b/tests/spec/ext_framebuffer_multisample/upsample.cpp @@ -54,7 +54,7 @@ PIGLIT_GL_TEST_MAIN(512 /*window_width*/, 256 /*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 int pattern_width = 256; const int pattern_height = 256; diff --git a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c index 748c86b0..ae0063b1 100644 --- a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c +++ b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( BUF_WIDTH /*window_width*/, BUF_WIDTH /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) /* Width of our stripes of z = 0.0, 0.5, 1.0 */ static int w = BUF_WIDTH / 3; diff --git a/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c index 8e0469b0..975a7317 100644 --- a/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c +++ b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c @@ -72,7 +72,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) static const GLenum formatTypes[] = { GL_RGBA, diff --git a/tests/spec/ext_packed_float/pack.c b/tests/spec/ext_packed_float/pack.c index 9e9eff87..60a7385f 100755 --- a/tests/spec/ext_packed_float/pack.c +++ b/tests/spec/ext_packed_float/pack.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) /* Any maximum e with m != 0 is NAN */ diff --git a/tests/spec/ext_texture_array/maxlayers.c b/tests/spec/ext_texture_array/maxlayers.c index 07caed68..19b12d11 100644 --- a/tests/spec/ext_texture_array/maxlayers.c +++ b/tests/spec/ext_texture_array/maxlayers.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) int height = 100, ybase = 0; diff --git a/tests/spec/ext_texture_integer/api-drawpixels.c b/tests/spec/ext_texture_integer/api-drawpixels.c index 7545416b..c2675355 100644 --- a/tests/spec/ext_texture_integer/api-drawpixels.c +++ b/tests/spec/ext_texture_integer/api-drawpixels.c @@ -61,7 +61,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*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/spec/ext_texture_integer/api-readpixels.c b/tests/spec/ext_texture_integer/api-readpixels.c index c9409aab..7541267a 100644 --- a/tests/spec/ext_texture_integer/api-readpixels.c +++ b/tests/spec/ext_texture_integer/api-readpixels.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*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/spec/ext_texture_integer/api-teximage.c b/tests/spec/ext_texture_integer/api-teximage.c index d8ba4148..767061e2 100644 --- a/tests/spec/ext_texture_integer/api-teximage.c +++ b/tests/spec/ext_texture_integer/api-teximage.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*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/spec/ext_texture_integer/fbo-blending.c b/tests/spec/ext_texture_integer/fbo-blending.c index 4ba3cf45..4ce29db7 100644 --- a/tests/spec/ext_texture_integer/fbo-blending.c +++ b/tests/spec/ext_texture_integer/fbo-blending.c @@ -45,7 +45,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 GLuint tex; static int color_loc; diff --git a/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c b/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c index df3e71a0..e4116883 100644 --- a/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c +++ b/tests/spec/ext_texture_integer/fbo-integer-precision-clear.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) static const char *TestName = "fbo-integer-precision-clear"; diff --git a/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c b/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c index 62f7e2a2..7a360db1 100644 --- a/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c +++ b/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.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) static const char *TestName = "fbo-integer-readpixels-sint-uint"; diff --git a/tests/spec/ext_texture_integer/getteximage-clamping.c b/tests/spec/ext_texture_integer/getteximage-clamping.c index 0f031eea..e320d721 100644 --- a/tests/spec/ext_texture_integer/getteximage-clamping.c +++ b/tests/spec/ext_texture_integer/getteximage-clamping.c @@ -49,7 +49,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) struct format_info { const char *name; diff --git a/tests/spec/ext_texture_integer/texture-integer-glsl130.c b/tests/spec/ext_texture_integer/texture-integer-glsl130.c index 49b2f0ef..c2f3200b 100644 --- a/tests/spec/ext_texture_integer/texture-integer-glsl130.c +++ b/tests/spec/ext_texture_integer/texture-integer-glsl130.c @@ -33,7 +33,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 = "texture-integer"; diff --git a/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c b/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c index 46025e7c..074ca640 100644 --- a/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c +++ b/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c @@ -39,7 +39,7 @@ #include "piglit-util-gl-common.h" -PIGLIT_GL_TEST_MAIN(170, 30, GLUT_RGBA | GLUT_DOUBLE) +PIGLIT_GL_TEST_MAIN(170, 30, PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display() diff --git a/tests/spec/ext_timer_query/time-elapsed.c b/tests/spec/ext_timer_query/time-elapsed.c index c473fe5c..4e55cbd0 100644 --- a/tests/spec/ext_timer_query/time-elapsed.c +++ b/tests/spec/ext_timer_query/time-elapsed.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum { TIME_ELAPSED, diff --git a/tests/spec/ext_transform_feedback/alignment.c b/tests/spec/ext_transform_feedback/alignment.c index c6dad961..339544d7 100644 --- a/tests/spec/ext_transform_feedback/alignment.c +++ b/tests/spec/ext_transform_feedback/alignment.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) /* Test parameters */ static unsigned long additional_offset; diff --git a/tests/spec/ext_transform_feedback/api-errors.c b/tests/spec/ext_transform_feedback/api-errors.c index 1dd84639..3541fc4e 100644 --- a/tests/spec/ext_transform_feedback/api-errors.c +++ b/tests/spec/ext_transform_feedback/api-errors.c @@ -53,7 +53,7 @@ PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, 16 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) #define XFB_BUFFER_SIZE 12 #define NUM_BUFFERS 2 diff --git a/tests/spec/ext_transform_feedback/buffer-usage.c b/tests/spec/ext_transform_feedback/buffer-usage.c index 585e9d22..cb85acd2 100644 --- a/tests/spec/ext_transform_feedback/buffer-usage.c +++ b/tests/spec/ext_transform_feedback/buffer-usage.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char *vstext = "#version 130\n" diff --git a/tests/spec/ext_transform_feedback/builtin-varyings.c b/tests/spec/ext_transform_feedback/builtin-varyings.c index 9bfb20f3..08bcbd82 100644 --- a/tests/spec/ext_transform_feedback/builtin-varyings.c +++ b/tests/spec/ext_transform_feedback/builtin-varyings.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) #define MAX_EXPECTED_OUTPUT_COMPONENTS 8 diff --git a/tests/spec/ext_transform_feedback/discard-api.c b/tests/spec/ext_transform_feedback/discard-api.c index 8cac71d3..765c84d2 100644 --- a/tests/spec/ext_transform_feedback/discard-api.c +++ b/tests/spec/ext_transform_feedback/discard-api.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_transform_feedback/discard-bitmap.c b/tests/spec/ext_transform_feedback/discard-bitmap.c index 136e62f4..d7817d4d 100644 --- a/tests/spec/ext_transform_feedback/discard-bitmap.c +++ b/tests/spec/ext_transform_feedback/discard-bitmap.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_transform_feedback/discard-clear.c b/tests/spec/ext_transform_feedback/discard-clear.c index 8cd79e64..c0a634bc 100644 --- a/tests/spec/ext_transform_feedback/discard-clear.c +++ b/tests/spec/ext_transform_feedback/discard-clear.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_transform_feedback/discard-copypixels.c b/tests/spec/ext_transform_feedback/discard-copypixels.c index 17628cbe..f05657e4 100644 --- a/tests/spec/ext_transform_feedback/discard-copypixels.c +++ b/tests/spec/ext_transform_feedback/discard-copypixels.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_transform_feedback/discard-drawarrays.c b/tests/spec/ext_transform_feedback/discard-drawarrays.c index 943f206b..1a2f68e4 100644 --- a/tests/spec/ext_transform_feedback/discard-drawarrays.c +++ b/tests/spec/ext_transform_feedback/discard-drawarrays.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_transform_feedback/discard-drawpixels.c b/tests/spec/ext_transform_feedback/discard-drawpixels.c index 54fe8523..12c225a6 100644 --- a/tests/spec/ext_transform_feedback/discard-drawpixels.c +++ b/tests/spec/ext_transform_feedback/discard-drawpixels.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/ext_transform_feedback/generatemipmap.c b/tests/spec/ext_transform_feedback/generatemipmap.c index afd88655..92da0b09 100644 --- a/tests/spec/ext_transform_feedback/generatemipmap.c +++ b/tests/spec/ext_transform_feedback/generatemipmap.c @@ -70,7 +70,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const float red[] = {1, 0, 0, 0}; static const float green[] = {0, 1, 0, 0.25}; diff --git a/tests/spec/ext_transform_feedback/get-buffer-state.c b/tests/spec/ext_transform_feedback/get-buffer-state.c index b71e4128..40d73251 100644 --- a/tests/spec/ext_transform_feedback/get-buffer-state.c +++ b/tests/spec/ext_transform_feedback/get-buffer-state.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, 16 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) #define XFB_BUFFER_SIZE 12 diff --git a/tests/spec/ext_transform_feedback/immediate-reuse.c b/tests/spec/ext_transform_feedback/immediate-reuse.c index 699ef94c..0d857ce6 100644 --- a/tests/spec/ext_transform_feedback/immediate-reuse.c +++ b/tests/spec/ext_transform_feedback/immediate-reuse.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 16 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static const char *vstext = "attribute vec4 in_position;\n" diff --git a/tests/spec/ext_transform_feedback/interleaved.c b/tests/spec/ext_transform_feedback/interleaved.c index 6c0e2567..f8053a44 100644 --- a/tests/spec/ext_transform_feedback/interleaved.c +++ b/tests/spec/ext_transform_feedback/interleaved.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char *vstext = { "varying vec3 v3;" diff --git a/tests/spec/ext_transform_feedback/intervening-read.c b/tests/spec/ext_transform_feedback/intervening-read.c index bec05385..744b3bd9 100644 --- a/tests/spec/ext_transform_feedback/intervening-read.c +++ b/tests/spec/ext_transform_feedback/intervening-read.c @@ -51,7 +51,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static enum test_mode { TEST_MODE_OUTPUT, diff --git a/tests/spec/ext_transform_feedback/max-varyings.c b/tests/spec/ext_transform_feedback/max-varyings.c index 04c7cae8..1506d1d4 100644 --- a/tests/spec/ext_transform_feedback/max-varyings.c +++ b/tests/spec/ext_transform_feedback/max-varyings.c @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN( (2 + MAX_VARYING * 12) /*window_width*/, (2 + MAX_VARYING * 12) /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char *xfb_varying_array[MAX_VARYING]; static GLuint xfb_buf; diff --git a/tests/spec/ext_transform_feedback/negative-prims.c b/tests/spec/ext_transform_feedback/negative-prims.c index 0bb58331..6228cb1c 100644 --- a/tests/spec/ext_transform_feedback/negative-prims.c +++ b/tests/spec/ext_transform_feedback/negative-prims.c @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) struct { GLenum tf_prim; diff --git a/tests/spec/ext_transform_feedback/order.c b/tests/spec/ext_transform_feedback/order.c index 45c3922c..b2767c1f 100644 --- a/tests/spec/ext_transform_feedback/order.c +++ b/tests/spec/ext_transform_feedback/order.c @@ -60,7 +60,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLenum draw_mode; static GLboolean use_draw_elements; diff --git a/tests/spec/ext_transform_feedback/output-type.c b/tests/spec/ext_transform_feedback/output-type.c index e6e89d8a..a6dae9c3 100644 --- a/tests/spec/ext_transform_feedback/output-type.c +++ b/tests/spec/ext_transform_feedback/output-type.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) #define DEFAULT_VALUE 0.123456 diff --git a/tests/spec/ext_transform_feedback/overflow-edge-cases.c b/tests/spec/ext_transform_feedback/overflow-edge-cases.c index c6d0194b..bebf2119 100644 --- a/tests/spec/ext_transform_feedback/overflow-edge-cases.c +++ b/tests/spec/ext_transform_feedback/overflow-edge-cases.c @@ -46,7 +46,7 @@ PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, 16 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) #define XFB_BUFFER_SIZE 12 #define MAX_VERTICES 9 diff --git a/tests/spec/ext_transform_feedback/position.c b/tests/spec/ext_transform_feedback/position.c index 57a9d672..405c918b 100644 --- a/tests/spec/ext_transform_feedback/position.c +++ b/tests/spec/ext_transform_feedback/position.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char *vstext = { "void main() {" diff --git a/tests/spec/ext_transform_feedback/separate.c b/tests/spec/ext_transform_feedback/separate.c index fe7dba58..55c919f2 100644 --- a/tests/spec/ext_transform_feedback/separate.c +++ b/tests/spec/ext_transform_feedback/separate.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char *vstext = { "varying vec3 v3;" diff --git a/tests/spec/ext_transform_feedback/tessellation.c b/tests/spec/ext_transform_feedback/tessellation.c index 37b5fcea..ba5c0706 100644 --- a/tests/spec/ext_transform_feedback/tessellation.c +++ b/tests/spec/ext_transform_feedback/tessellation.c @@ -123,7 +123,7 @@ PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, 256 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) /* Test parameters */ static GLenum draw_mode; diff --git a/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c b/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c index f83b3f8c..96166775 100644 --- a/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c +++ b/tests/spec/ext_unpack_subimage/ext_unpack_subimage.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 extension_supported; static GLboolean pass; diff --git a/tests/spec/gl-1.0/edgeflag-quads.c b/tests/spec/gl-1.0/edgeflag-quads.c index c1c20f27..f420a455 100644 --- a/tests/spec/gl-1.0/edgeflag-quads.c +++ b/tests/spec/gl-1.0/edgeflag-quads.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/gl-1.0/edgeflag.c b/tests/spec/gl-1.0/edgeflag.c index a32e7dd5..6f2e01d3 100644 --- a/tests/spec/gl-1.0/edgeflag.c +++ b/tests/spec/gl-1.0/edgeflag.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/gl-2.0/api/clip-flag-behavior.c b/tests/spec/gl-2.0/api/clip-flag-behavior.c index 0fb08526..0b635411 100644 --- a/tests/spec/gl-2.0/api/clip-flag-behavior.c +++ b/tests/spec/gl-2.0/api/clip-flag-behavior.c @@ -41,7 +41,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/spec/gl-2.0/api/getattriblocation-conventional.c b/tests/spec/gl-2.0/api/getattriblocation-conventional.c index 8f769eb0..dbe99a31 100644 --- a/tests/spec/gl-2.0/api/getattriblocation-conventional.c +++ b/tests/spec/gl-2.0/api/getattriblocation-conventional.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 *vs_code = "attribute vec4 not_used;\n" diff --git a/tests/spec/gl-2.0/edgeflag.c b/tests/spec/gl-2.0/edgeflag.c index fbf30c1d..4c6b2e92 100644 --- a/tests/spec/gl-2.0/edgeflag.c +++ b/tests/spec/gl-2.0/edgeflag.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLuint color_index; 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 82b96a0a..c2cf18db 100644 --- a/tests/spec/gl-2.0/vertex-program-two-side.c +++ b/tests/spec/gl-2.0/vertex-program-two-side.c @@ -48,7 +48,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 GLint prog; diff --git a/tests/spec/gl-2.1/minmax.c b/tests/spec/gl-2.1/minmax.c index edb32a23..384dac38 100644 --- a/tests/spec/gl-2.1/minmax.c +++ b/tests/spec/gl-2.1/minmax.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c index b6dbfc78..f8116c83 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c +++ b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c @@ -32,7 +32,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/spec/gl-3.0/api/bindfragdata-link-error.c b/tests/spec/gl-3.0/api/bindfragdata-link-error.c index 0e87cf7e..e580328b 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-link-error.c +++ b/tests/spec/gl-3.0/api/bindfragdata-link-error.c @@ -30,7 +30,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 *vs_text = "#version 130\n" diff --git a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c index 8a87ffca..1afcd65f 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c +++ b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c @@ -31,7 +31,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 *vs_text = "#version 130\n" diff --git a/tests/spec/gl-3.0/api/clearbuffer-common.c b/tests/spec/gl-3.0/api/clearbuffer-common.c index f016b586..b41a99f6 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-common.c +++ b/tests/spec/gl-3.0/api/clearbuffer-common.c @@ -33,7 +33,7 @@ const int default_stencil = 0x7a; PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) GLuint generate_simple_fbo(bool color, bool stencil, bool depth, bool packed) diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c index a81c53ea..cbc86e44 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) /* These enums don't really exist, but they were accidentally shipped in some * versions of glext.h. diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c index 4ab765bc..23e381bb 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c @@ -32,7 +32,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/spec/gl-3.0/api/getfragdatalocation.c b/tests/spec/gl-3.0/api/getfragdatalocation.c index a85bae9c..608f7dc3 100644 --- a/tests/spec/gl-3.0/api/getfragdatalocation.c +++ b/tests/spec/gl-3.0/api/getfragdatalocation.c @@ -30,7 +30,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 *vs_text = "#version 130\n" diff --git a/tests/spec/gl-3.0/api/integer-errors.c b/tests/spec/gl-3.0/api/integer-errors.c index 90e330a3..7dc99a60 100644 --- a/tests/spec/gl-3.0/api/integer-errors.c +++ b/tests/spec/gl-3.0/api/integer-errors.c @@ -32,7 +32,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 bool test_api_errors(void) diff --git a/tests/spec/gl-3.0/minmax.c b/tests/spec/gl-3.0/minmax.c index 7bcf83ab..a295e74b 100644 --- a/tests/spec/gl-3.0/minmax.c +++ b/tests/spec/gl-3.0/minmax.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) 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 d6896596..eae9592f 100644 --- a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c +++ b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) 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 20bb2e2e..e0f64c47 100644 --- a/tests/spec/gl-3.0/required-sized-texture-formats.c +++ b/tests/spec/gl-3.0/required-sized-texture-formats.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) GLenum type_queries[CHANNELS] = { GL_TEXTURE_RED_TYPE, 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 8a5fa76a..d1c1dfbc 100644 --- a/tests/spec/gl-3.0/required-texture-attachment-formats.c +++ b/tests/spec/gl-3.0/required-texture-attachment-formats.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/gl-3.0/texture-integer.c b/tests/spec/gl-3.0/texture-integer.c index 4fad5e1a..3e6f55ef 100644 --- a/tests/spec/gl-3.0/texture-integer.c +++ b/tests/spec/gl-3.0/texture-integer.c @@ -31,7 +31,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 = "texture-integer"; static GLint TexWidth = 16, TexHeight = 16; diff --git a/tests/spec/gl-3.1/minmax.c b/tests/spec/gl-3.1/minmax.c index e9b0a682..15d38f3f 100644 --- a/tests/spec/gl-3.1/minmax.c +++ b/tests/spec/gl-3.1/minmax.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c b/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c index 9fed5b6a..e18d7409 100644 --- a/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c +++ b/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c @@ -173,7 +173,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) GLint position_angle_loc; GLint clipVertex_angle_loc; diff --git a/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c b/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c index 1ff270ba..cfc8c613 100644 --- a/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c +++ b/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) const char *vs_source = "void main()\n" diff --git a/tests/spec/glsl-1.20/recursion/recursion.c b/tests/spec/glsl-1.20/recursion/recursion.c index 9887d4f5..2a8aac04 100644 --- a/tests/spec/glsl-1.20/recursion/recursion.c +++ b/tests/spec/glsl-1.20/recursion/recursion.c @@ -52,7 +52,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 simple_text[] = "#version 120\n" diff --git a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c index e2a5912a..19f485df 100644 --- a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c +++ b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c @@ -62,7 +62,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 vert[] = "#version 130\n" diff --git a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c index 52f1ba5d..ed975ef5 100644 --- a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c +++ b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c @@ -47,7 +47,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 64 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static int coord1_location, coord2_location; diff --git a/tests/spec/glsl-1.30/execution/fs-execution-ordering.c b/tests/spec/glsl-1.30/execution/fs-execution-ordering.c index fd68cbb7..1cfa05b7 100644 --- a/tests/spec/glsl-1.30/execution/fs-execution-ordering.c +++ b/tests/spec/glsl-1.30/execution/fs-execution-ordering.c @@ -40,7 +40,7 @@ PIGLIT_GL_TEST_MAIN( 100 /* window_width */, 100 /* window_height */, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) #define SMALL_COMPOSITE 4 #define LARGE_PRIME 7919 diff --git a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c index dfdf50b9..941d1595 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 90 /*window_width*/, 150 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) const int tex_size = 64; diff --git a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c index 89a1ed42..d9d03add 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 90 /*window_width*/, 150 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) const int tex_size = 64; diff --git a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c index 8d7865e4..1d09e52f 100644 --- a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c +++ b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c @@ -113,7 +113,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 float gl_version; diff --git a/tests/spec/glsl-1.30/execution/vertexid-beginend.c b/tests/spec/glsl-1.30/execution/vertexid-beginend.c index 8a5aa94d..86c24b48 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-beginend.c +++ b/tests/spec/glsl-1.30/execution/vertexid-beginend.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "#version 130\n" diff --git a/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c b/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c index 8c62e8b7..410a8991 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c +++ b/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "#version 130\n" diff --git a/tests/spec/glsl-1.30/execution/vertexid-drawelements.c b/tests/spec/glsl-1.30/execution/vertexid-drawelements.c index f197eff1..ea82e02c 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-drawelements.c +++ b/tests/spec/glsl-1.30/execution/vertexid-drawelements.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, 30 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static const char vs_text[] = "#version 130\n" diff --git a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c index 3210830f..f4852c40 100644 --- a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c +++ b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c @@ -39,7 +39,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 vert[] = "#version 130\n" diff --git a/tests/spec/glsl-1.30/texel-offset-limits.c b/tests/spec/glsl-1.30/texel-offset-limits.c index 17119d7d..7a49d20e 100644 --- a/tests/spec/glsl-1.30/texel-offset-limits.c +++ b/tests/spec/glsl-1.30/texel-offset-limits.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*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() diff --git a/tests/spec/glsl-1.40/tf-no-position.c b/tests/spec/glsl-1.40/tf-no-position.c index f86706ea..7f067dfd 100644 --- a/tests/spec/glsl-1.40/tf-no-position.c +++ b/tests/spec/glsl-1.40/tf-no-position.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, 10 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static const char *vs_source = "#version 140\n" diff --git a/tests/spec/nv_conditional_render/begin-while-active.c b/tests/spec/nv_conditional_render/begin-while-active.c index 1bd4b792..23cbb8e0 100644 --- a/tests/spec/nv_conditional_render/begin-while-active.c +++ b/tests/spec/nv_conditional_render/begin-while-active.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/nv_conditional_render/begin-zero.c b/tests/spec/nv_conditional_render/begin-zero.c index b7aab6fb..e1519c02 100644 --- a/tests/spec/nv_conditional_render/begin-zero.c +++ b/tests/spec/nv_conditional_render/begin-zero.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/nv_conditional_render/bitmap.c b/tests/spec/nv_conditional_render/bitmap.c index ceda6558..31122940 100644 --- a/tests/spec/nv_conditional_render/bitmap.c +++ b/tests/spec/nv_conditional_render/bitmap.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c index 5b9d487d..b330d952 100644 --- a/tests/spec/nv_conditional_render/blitframebuffer.c +++ b/tests/spec/nv_conditional_render/blitframebuffer.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static void fill_tex(int level, int w, int h, const GLfloat *color) { diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c index 8bc26b96..22883f1d 100644 --- a/tests/spec/nv_conditional_render/clear.c +++ b/tests/spec/nv_conditional_render/clear.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c index f87e8179..c83eb0a3 100644 --- a/tests/spec/nv_conditional_render/copypixels.c +++ b/tests/spec/nv_conditional_render/copypixels.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/nv_conditional_render/copyteximage.c b/tests/spec/nv_conditional_render/copyteximage.c index 8fd7dfa0..3baa45d9 100644 --- a/tests/spec/nv_conditional_render/copyteximage.c +++ b/tests/spec/nv_conditional_render/copyteximage.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static void fill_tex(int level, int w, int h, const GLfloat *color) diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c index 1a70b5c7..254ebaa5 100644 --- a/tests/spec/nv_conditional_render/copytexsubimage.c +++ b/tests/spec/nv_conditional_render/copytexsubimage.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static void fill_tex(int level, int w, int h, const GLfloat *color) diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/dlist.c index 75286b5d..c2202a3e 100644 --- a/tests/spec/nv_conditional_render/dlist.c +++ b/tests/spec/nv_conditional_render/dlist.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/nv_conditional_render/drawpixels.c b/tests/spec/nv_conditional_render/drawpixels.c index d56b6c83..97f4ac05 100644 --- a/tests/spec/nv_conditional_render/drawpixels.c +++ b/tests/spec/nv_conditional_render/drawpixels.c @@ -43,7 +43,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/nv_conditional_render/generatemipmap.c b/tests/spec/nv_conditional_render/generatemipmap.c index abc8497c..0bfbcd2e 100644 --- a/tests/spec/nv_conditional_render/generatemipmap.c +++ b/tests/spec/nv_conditional_render/generatemipmap.c @@ -36,7 +36,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static void fill_level(int level, int size, const GLfloat *color) diff --git a/tests/spec/nv_conditional_render/vertex_array.c b/tests/spec/nv_conditional_render/vertex_array.c index b5d97dba..8fd96c29 100644 --- a/tests/spec/nv_conditional_render/vertex_array.c +++ b/tests/spec/nv_conditional_render/vertex_array.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/spec/nv_texture_barrier/blending-in-shader.c b/tests/spec/nv_texture_barrier/blending-in-shader.c index 893e0a35..6d9d00ff 100644 --- a/tests/spec/nv_texture_barrier/blending-in-shader.c +++ b/tests/spec/nv_texture_barrier/blending-in-shader.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLuint tex, fbo, prog, texloc; static float tex_data[16*16*4], res_data[16*16*4]; diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c index fbebce2a..9fdd3538 100644 --- a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c +++ b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c @@ -30,7 +30,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/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-miptree.c b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-miptree.c index cecd327b..2ee90e00 100644 --- a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-miptree.c +++ b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-miptree.c @@ -55,7 +55,7 @@ static const int window_height = 2 * level0_height; PIGLIT_GL_TEST_MAIN( window_width, window_height, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static GLuint prog; diff --git a/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c b/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c index 4d433c3e..39a734db 100644 --- a/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c +++ b/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.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) struct test_vector { GLenum internal_format; diff --git a/tests/spec/oes_draw_texture/oes_draw_texture.c b/tests/spec/oes_draw_texture/oes_draw_texture.c index 44599e55..b9f91fe0 100644 --- a/tests/spec/oes_draw_texture/oes_draw_texture.c +++ b/tests/spec/oes_draw_texture/oes_draw_texture.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_DOUBLE) /* see piglit_rgbw_texture */ static const float red[4] = { 1.0f, 0.0f, 0.0f, 0.0f }; diff --git a/tests/texturing/1-1-linear-texture.c b/tests/texturing/1-1-linear-texture.c index 0514890b..213c480a 100644 --- a/tests/texturing/1-1-linear-texture.c +++ b/tests/texturing/1-1-linear-texture.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) #define DATA_SIZE (piglit_width * piglit_height * 4) diff --git a/tests/texturing/array-depth-roundtrip.c b/tests/texturing/array-depth-roundtrip.c index 3eb71f3c..5c4d14c4 100644 --- a/tests/texturing/array-depth-roundtrip.c +++ b/tests/texturing/array-depth-roundtrip.c @@ -55,7 +55,7 @@ PIGLIT_GL_TEST_MAIN( TEX_WIDTH * NUM_TILES_ACROSS, TEX_HEIGHT * NUM_TILES_DOWN, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) GLuint tex; diff --git a/tests/texturing/array-texture.c b/tests/texturing/array-texture.c index b5d216a4..e0765823 100644 --- a/tests/texturing/array-texture.c +++ b/tests/texturing/array-texture.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 400 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) int height = 100, ybase = 0; diff --git a/tests/texturing/compressedteximage.c b/tests/texturing/compressedteximage.c index 7bcac9f2..02721782 100644 --- a/tests/texturing/compressedteximage.c +++ b/tests/texturing/compressedteximage.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( (SIZE * 2) + 60 /*window_width*/, SIZE + 20 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) struct format { const char *name; diff --git a/tests/texturing/copyteximage-border.c b/tests/texturing/copyteximage-border.c index 58451fe6..7492d8f7 100644 --- a/tests/texturing/copyteximage-border.c +++ b/tests/texturing/copyteximage-border.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( TEX_SIZE * 2 + 30 /*window_width*/, TEX_SIZE + 20 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) enum piglit_result piglit_display(void) diff --git a/tests/texturing/copyteximage-clipping.c b/tests/texturing/copyteximage-clipping.c index 1926d99a..ea02928f 100644 --- a/tests/texturing/copyteximage-clipping.c +++ b/tests/texturing/copyteximage-clipping.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLboolean test(void) diff --git a/tests/texturing/copyteximage.c b/tests/texturing/copyteximage.c index 409c0c6b..b6725105 100644 --- a/tests/texturing/copyteximage.c +++ b/tests/texturing/copyteximage.c @@ -109,7 +109,7 @@ static int test_target = -1; PIGLIT_GL_TEST_MAIN( IMAGE_SIZE * (ARRAY_SIZE(test_vectors) + 1) /*window_width*/, IMAGE_SIZE /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_ALPHA) static const float texCoords_1d[2] = { 0.0, 1.0 }; static const float texCoords_2d[4][2] = { diff --git a/tests/texturing/copytexsubimage.c b/tests/texturing/copytexsubimage.c index 4eb0eb2e..ffb89371 100644 --- a/tests/texturing/copytexsubimage.c +++ b/tests/texturing/copytexsubimage.c @@ -30,7 +30,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 200 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) /** Should GL_TEXTURE_RECTANGLE_ARB be tested? */ int have_rect = 0; diff --git a/tests/texturing/crossbar.c b/tests/texturing/crossbar.c index 9bdaae8c..59752b86 100644 --- a/tests/texturing/crossbar.c +++ b/tests/texturing/crossbar.c @@ -58,7 +58,7 @@ static const GLint tests[][8] = { PIGLIT_GL_TEST_MAIN( 100 * (NUM_TESTS + 1) /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static void DoFrame( void ) { diff --git a/tests/texturing/cubemap.c b/tests/texturing/cubemap.c index fe3d9b63..f986ea21 100644 --- a/tests/texturing/cubemap.c +++ b/tests/texturing/cubemap.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( (64 * 6 + PAD * 9) * 2 /*window_width*/, 400 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) int max_size; diff --git a/tests/texturing/depth-cube-map.c b/tests/texturing/depth-cube-map.c index 47f24772..c2db7f3c 100644 --- a/tests/texturing/depth-cube-map.c +++ b/tests/texturing/depth-cube-map.c @@ -33,7 +33,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 tex; static GLint prog; diff --git a/tests/texturing/depth-level-clamp.c b/tests/texturing/depth-level-clamp.c index c9a91b61..8add593c 100644 --- a/tests/texturing/depth-level-clamp.c +++ b/tests/texturing/depth-level-clamp.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( (MAX_SIZE * 2 + PAD * 3) /*window_width*/, (MAX_SIZE * MAX_LOD + PAD * (MAX_LOD + 1)) /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static void set_level_value(int level, int size, float val) diff --git a/tests/texturing/depth-tex-compare.c b/tests/texturing/depth-tex-compare.c index d44a0024..ea719b1b 100644 --- a/tests/texturing/depth-tex-compare.c +++ b/tests/texturing/depth-tex-compare.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, 300 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLuint tex; diff --git a/tests/texturing/depth-tex-modes-glsl.c b/tests/texturing/depth-tex-modes-glsl.c index 24ef9893..6008fe0e 100644 --- a/tests/texturing/depth-tex-modes-glsl.c +++ b/tests/texturing/depth-tex-modes-glsl.c @@ -33,7 +33,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 tex[3]; static GLint prog; diff --git a/tests/texturing/depth-tex-modes-rg.c b/tests/texturing/depth-tex-modes-rg.c index a2abf47c..b1efb441 100644 --- a/tests/texturing/depth-tex-modes-rg.c +++ b/tests/texturing/depth-tex-modes-rg.c @@ -43,7 +43,7 @@ static const GLenum depth_texture_modes[] = { PIGLIT_GL_TEST_MAIN( 1 + (TEST_COLS * (BOX_SIZE + 1)) /*window_width*/, 1 + (TEST_ROWS * (BOX_SIZE + 1)) /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) GLuint tex[2]; diff --git a/tests/texturing/depth-tex-modes.c b/tests/texturing/depth-tex-modes.c index 35501a09..13cba4d8 100644 --- a/tests/texturing/depth-tex-modes.c +++ b/tests/texturing/depth-tex-modes.c @@ -43,7 +43,7 @@ static const GLenum depth_texture_modes[] = { PIGLIT_GL_TEST_MAIN( 1 + (TEST_COLS * (BOX_SIZE + 1)) /*window_width*/, 1 + (TEST_ROWS * (BOX_SIZE + 1)) /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) GLuint tex[2]; diff --git a/tests/texturing/depthstencil-render-miplevels.cpp b/tests/texturing/depthstencil-render-miplevels.cpp index 4246fc7d..7498f29f 100644 --- a/tests/texturing/depthstencil-render-miplevels.cpp +++ b/tests/texturing/depthstencil-render-miplevels.cpp @@ -89,7 +89,7 @@ PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, 16 /*window_height*/, - GLUT_RGBA) + PIGLIT_GL_VISUAL_RGBA) namespace { diff --git a/tests/texturing/fragment-and-vertex-texturing.c b/tests/texturing/fragment-and-vertex-texturing.c index d960c5e8..420aca9b 100644 --- a/tests/texturing/fragment-and-vertex-texturing.c +++ b/tests/texturing/fragment-and-vertex-texturing.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const char *vs_source = "uniform sampler2D vertex_tex; \n" diff --git a/tests/texturing/fxt1-teximage.c b/tests/texturing/fxt1-teximage.c index 112037cb..c7d0bdba 100644 --- a/tests/texturing/fxt1-teximage.c +++ b/tests/texturing/fxt1-teximage.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 300 /*window_width*/, 300 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define SIZE 128 diff --git a/tests/texturing/gen-compressed-teximage.c b/tests/texturing/gen-compressed-teximage.c index 58a21b93..7aff23a0 100644 --- a/tests/texturing/gen-compressed-teximage.c +++ b/tests/texturing/gen-compressed-teximage.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 512 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define SIZE 128 diff --git a/tests/texturing/gen-nonzero-unit.c b/tests/texturing/gen-nonzero-unit.c index 2b641de5..558da61c 100644 --- a/tests/texturing/gen-nonzero-unit.c +++ b/tests/texturing/gen-nonzero-unit.c @@ -44,7 +44,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 512 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static PFNGLACTIVETEXTUREPROC ActiveTexture = NULL; diff --git a/tests/texturing/gen-teximage.c b/tests/texturing/gen-teximage.c index 243b5e9b..f63b4533 100644 --- a/tests/texturing/gen-teximage.c +++ b/tests/texturing/gen-teximage.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 512 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define SIZE 128 diff --git a/tests/texturing/gen-texsubimage.c b/tests/texturing/gen-texsubimage.c index 2ac21c71..0e30a3c6 100644 --- a/tests/texturing/gen-texsubimage.c +++ b/tests/texturing/gen-texsubimage.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, 512 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static void display_mipmaps(int start_x, int start_y) { diff --git a/tests/texturing/getteximage-formats.c b/tests/texturing/getteximage-formats.c index a14dd4ec..f0660bd8 100644 --- a/tests/texturing/getteximage-formats.c +++ b/tests/texturing/getteximage-formats.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 600 /*window_width*/, 200 /*window_height*/, - GLUT_RGBA | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static const char *TestName = "getteximage-formats"; diff --git a/tests/texturing/getteximage-luminance.c b/tests/texturing/getteximage-luminance.c index b7f08414..33b47c11 100644 --- a/tests/texturing/getteximage-luminance.c +++ b/tests/texturing/getteximage-luminance.c @@ -33,7 +33,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) static const char *TestName = "getteximage-luminance"; static float tolerance = 2.0 / 255.0; diff --git a/tests/texturing/getteximage-simple.c b/tests/texturing/getteximage-simple.c index bf1c1b82..bffd5571 100644 --- a/tests/texturing/getteximage-simple.c +++ b/tests/texturing/getteximage-simple.c @@ -15,7 +15,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) static GLubyte data[4096]; /* 64*16*4 */ diff --git a/tests/texturing/incomplete-texture.c b/tests/texturing/incomplete-texture.c index 7565d232..f958e19b 100644 --- a/tests/texturing/incomplete-texture.c +++ b/tests/texturing/incomplete-texture.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, 50 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define TEST_FIXED_FUNC 1 #define TEST_ARB_FP 2 diff --git a/tests/texturing/levelclamp.c b/tests/texturing/levelclamp.c index 3d450007..ccf05c5f 100644 --- a/tests/texturing/levelclamp.c +++ b/tests/texturing/levelclamp.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, 600 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLfloat colors[][3] = { {1.0, 0.0, 0.0}, diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c index 9d39ab78..2a885e0a 100644 --- a/tests/texturing/lodbias.c +++ b/tests/texturing/lodbias.c @@ -48,7 +48,7 @@ PIGLIT_GL_TEST_MAIN( 3*SquareSize /*window_width*/, 3*SquareSize /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static int CurrentTest = 0; static int CurrentBias = 0; diff --git a/tests/texturing/lodclamp-between-max.c b/tests/texturing/lodclamp-between-max.c index 567dfbd5..6e6d8cc8 100644 --- a/tests/texturing/lodclamp-between-max.c +++ b/tests/texturing/lodclamp-between-max.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 200 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLfloat colors[][3] = { {1.0, 0.0, 0.0}, diff --git a/tests/texturing/lodclamp-between.c b/tests/texturing/lodclamp-between.c index d69c9cfe..16f1cfbc 100644 --- a/tests/texturing/lodclamp-between.c +++ b/tests/texturing/lodclamp-between.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 200 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLfloat colors[][3] = { {1.0, 0.0, 0.0}, diff --git a/tests/texturing/lodclamp.c b/tests/texturing/lodclamp.c index 0150e2e4..3539306d 100644 --- a/tests/texturing/lodclamp.c +++ b/tests/texturing/lodclamp.c @@ -39,7 +39,7 @@ PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, 600 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) static GLfloat colors[][3] = { {1.0, 0.0, 0.0}, diff --git a/tests/texturing/max-texture-size-level.c b/tests/texturing/max-texture-size-level.c index 3b064827..c30de82a 100644 --- a/tests/texturing/max-texture-size-level.c +++ b/tests/texturing/max-texture-size-level.c @@ -38,7 +38,7 @@ #include "piglit-util-gl-common.h" -PIGLIT_GL_TEST_MAIN(100, 100, GLUT_RGBA | GLUT_DOUBLE) +PIGLIT_GL_TEST_MAIN(100, 100, PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/texturing/max-texture-size.c b/tests/texturing/max-texture-size.c index 4addf57b..fa91a3cf 100644 --- a/tests/texturing/max-texture-size.c +++ b/tests/texturing/max-texture-size.c @@ -47,7 +47,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) static const GLenum target[] = { GL_TEXTURE_1D, diff --git a/tests/texturing/mipmap-setup.c b/tests/texturing/mipmap-setup.c index 18712d65..3ce87b58 100644 --- a/tests/texturing/mipmap-setup.c +++ b/tests/texturing/mipmap-setup.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, 200 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB) #define MAX_LEVEL 7 diff --git a/tests/texturing/proxy-texture.c b/tests/texturing/proxy-texture.c index 8964284c..60b81db9 100644 --- a/tests/texturing/proxy-texture.c +++ b/tests/texturing/proxy-texture.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) static void diff --git a/tests/texturing/rg-draw-pixels.c b/tests/texturing/rg-draw-pixels.c index 38b0e24d..cc696d5f 100644 --- a/tests/texturing/rg-draw-pixels.c +++ b/tests/texturing/rg-draw-pixels.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 40 /*window_width*/, 30 /*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/texturing/rg-teximage-01.c b/tests/texturing/rg-teximage-01.c index 45a292a2..35e4f85f 100644 --- a/tests/texturing/rg-teximage-01.c +++ b/tests/texturing/rg-teximage-01.c @@ -54,7 +54,7 @@ GLboolean pass = GL_TRUE; PIGLIT_GL_TEST_MAIN( WIDTH * Elements(tex) /*window_width*/, HEIGHT /*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/texturing/rg-teximage-02.c b/tests/texturing/rg-teximage-02.c index d183bc1c..77c568ea 100644 --- a/tests/texturing/rg-teximage-02.c +++ b/tests/texturing/rg-teximage-02.c @@ -54,7 +54,7 @@ GLboolean pass = GL_TRUE; PIGLIT_GL_TEST_MAIN( WIDTH * Elements(tex) /*window_width*/, HEIGHT /*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/texturing/rgtc-teximage-01.c b/tests/texturing/rgtc-teximage-01.c index 5afd24d2..2319a910 100644 --- a/tests/texturing/rgtc-teximage-01.c +++ b/tests/texturing/rgtc-teximage-01.c @@ -55,7 +55,7 @@ GLboolean pass = GL_TRUE; PIGLIT_GL_TEST_MAIN( WIDTH * Elements(tex) /*window_width*/, HEIGHT /*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/texturing/rgtc-teximage-02.c b/tests/texturing/rgtc-teximage-02.c index f39aa589..91834f3a 100644 --- a/tests/texturing/rgtc-teximage-02.c +++ b/tests/texturing/rgtc-teximage-02.c @@ -55,7 +55,7 @@ GLboolean pass = GL_TRUE; PIGLIT_GL_TEST_MAIN( WIDTH * Elements(tex) /*window_width*/, HEIGHT /*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/texturing/s3tc-errors.c b/tests/texturing/s3tc-errors.c index b4b6776d..e4853b3e 100644 --- a/tests/texturing/s3tc-errors.c +++ b/tests/texturing/s3tc-errors.c @@ -34,7 +34,7 @@ #include "piglit-util-gl-common.h" -PIGLIT_GL_TEST_MAIN(200, 200, GLUT_RGB | GLUT_DOUBLE) +PIGLIT_GL_TEST_MAIN(200, 200, PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) static const float red[4] = {1.0, 0.0, 0.0, 1.0}; diff --git a/tests/texturing/s3tc-teximage.c b/tests/texturing/s3tc-teximage.c index 01e2e97b..99cdb959 100644 --- a/tests/texturing/s3tc-teximage.c +++ b/tests/texturing/s3tc-teximage.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, 600 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define SIZE 128 diff --git a/tests/texturing/s3tc-texsubimage.c b/tests/texturing/s3tc-texsubimage.c index b575d8b7..52251ff0 100644 --- a/tests/texturing/s3tc-texsubimage.c +++ b/tests/texturing/s3tc-texsubimage.c @@ -37,7 +37,7 @@ PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, 600 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define SIZE 128 diff --git a/tests/texturing/sampler-cube-shadow.c b/tests/texturing/sampler-cube-shadow.c index 52994cfc..a3a0f75a 100644 --- a/tests/texturing/sampler-cube-shadow.c +++ b/tests/texturing/sampler-cube-shadow.c @@ -37,7 +37,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 tex; static GLint prog; diff --git a/tests/texturing/shaders/texelFetch.c b/tests/texturing/shaders/texelFetch.c index e9da3f7f..696a3676 100644 --- a/tests/texturing/shaders/texelFetch.c +++ b/tests/texturing/shaders/texelFetch.c @@ -81,7 +81,7 @@ PIGLIT_GL_TEST_MAIN( 355 /*window_width*/, 250 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) /** Vertex shader attribute locations */ const int pos_loc = 0; diff --git a/tests/texturing/shaders/textureSize.c b/tests/texturing/shaders/textureSize.c index f89ff03e..565b6bbe 100644 --- a/tests/texturing/shaders/textureSize.c +++ b/tests/texturing/shaders/textureSize.c @@ -49,7 +49,7 @@ PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, 30 /*window_height*/, - GLUT_RGBA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_DOUBLE) static int lod_location; static int vertex_location; diff --git a/tests/texturing/sized-texture-format-channels.c b/tests/texturing/sized-texture-format-channels.c index 0a6cb125..f7fdcfe0 100644 --- a/tests/texturing/sized-texture-format-channels.c +++ b/tests/texturing/sized-texture-format-channels.c @@ -51,7 +51,7 @@ PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, 32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) GLenum type_queries[CHANNELS] = { GL_TEXTURE_RED_TYPE, diff --git a/tests/texturing/streaming-texture-leak.c b/tests/texturing/streaming-texture-leak.c index 5c2d1004..ca5ae849 100644 --- a/tests/texturing/streaming-texture-leak.c +++ b/tests/texturing/streaming-texture-leak.c @@ -41,7 +41,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define TEX_SIZE 1024 static int tex_buffer[TEX_SIZE * TEX_SIZE]; diff --git a/tests/texturing/tex-border-1.c b/tests/texturing/tex-border-1.c index 6d8616b1..2f2ee966 100644 --- a/tests/texturing/tex-border-1.c +++ b/tests/texturing/tex-border-1.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, 50 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c index 9e7421c6..a43f0d35 100644 --- a/tests/texturing/tex-miplevel-selection.c +++ b/tests/texturing/tex-miplevel-selection.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 900 /*window_width*/, 600 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define TEX_WIDTH 32 #define TEX_HEIGHT 32 diff --git a/tests/texturing/tex-skipped-unit.c b/tests/texturing/tex-skipped-unit.c index 6668770b..19c9ad92 100644 --- a/tests/texturing/tex-skipped-unit.c +++ b/tests/texturing/tex-skipped-unit.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( TEXSIZE * 2 /*window_width*/, TEXSIZE * 2 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) GLvoid draw_rect_tex(float x, float y, float w, float h, diff --git a/tests/texturing/tex-srgb.c b/tests/texturing/tex-srgb.c index 1c2bf14a..48ca5c29 100644 --- a/tests/texturing/tex-srgb.c +++ b/tests/texturing/tex-srgb.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) #define SIZE 128 diff --git a/tests/texturing/tex-swizzle.c b/tests/texturing/tex-swizzle.c index 0f805687..0264bd22 100644 --- a/tests/texturing/tex-swizzle.c +++ b/tests/texturing/tex-swizzle.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 GLuint tex[1]; diff --git a/tests/texturing/tex3d-depth1.c b/tests/texturing/tex3d-depth1.c index a2755dad..8e2edfc8 100644 --- a/tests/texturing/tex3d-depth1.c +++ b/tests/texturing/tex3d-depth1.c @@ -35,7 +35,7 @@ PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, 64 /*window_height*/, - GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) #define TEX_SIZE 8 diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c index 0a8f45b2..55c3e4c8 100644 --- a/tests/texturing/tex3d-maxsize.c +++ b/tests/texturing/tex3d-maxsize.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static const char *TestName = "tex3d-maxsize"; diff --git a/tests/texturing/tex3d-npot.c b/tests/texturing/tex3d-npot.c index 9dd6fa50..392b2c55 100644 --- a/tests/texturing/tex3d-npot.c +++ b/tests/texturing/tex3d-npot.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLuint Texture; diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c index 49b358a9..1786f213 100644 --- a/tests/texturing/tex3d.c +++ b/tests/texturing/tex3d.c @@ -31,7 +31,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA) static GLuint Texture; diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c index d6edcbca..864c28dd 100644 --- a/tests/texturing/texdepth.c +++ b/tests/texturing/texdepth.c @@ -17,7 +17,7 @@ static int Width = COLS*32, Height = ROWS*32; PIGLIT_GL_TEST_MAIN( COLS*32 /*window_width*/, ROWS*32 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA | GLUT_DEPTH) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DEPTH) static int CellWidth, CellHeight; static int CurrentTest = 0; diff --git a/tests/texturing/teximage-errors.c b/tests/texturing/teximage-errors.c index bc6bc59b..4186d3df 100644 --- a/tests/texturing/teximage-errors.c +++ b/tests/texturing/teximage-errors.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, 100 /*window_height*/, - GLUT_RGB) + PIGLIT_GL_VISUAL_RGB) diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c index b991a204..cc2038a0 100644 --- a/tests/texturing/texrect-many.c +++ b/tests/texturing/texrect-many.c @@ -11,7 +11,7 @@ PIGLIT_GL_TEST_MAIN( 16 * 16 /*window_width*/, 11 * 16 /*window_height*/, - GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA) static int NumTextures = 16; static GLuint Textures[16]; diff --git a/tests/texturing/texredefine.c b/tests/texturing/texredefine.c index 5f470b33..a8af697c 100644 --- a/tests/texturing/texredefine.c +++ b/tests/texturing/texredefine.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static const int CellSize = 8; /* see cell_coords */ diff --git a/tests/texturing/texsubimage.c b/tests/texturing/texsubimage.c index f2ca3ece..1e0e16c9 100644 --- a/tests/texturing/texsubimage.c +++ b/tests/texturing/texsubimage.c @@ -38,7 +38,7 @@ PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, 150 /*window_height*/, - GLUT_RGBA | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGBA | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) /** * This is a subset of the formats in fbo-formats.h diff --git a/tests/texturing/texture-al.c b/tests/texturing/texture-al.c index 5706c1e8..4b9caf59 100644 --- a/tests/texturing/texture-al.c +++ b/tests/texturing/texture-al.c @@ -34,7 +34,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static const char *TestName = "texture-al"; diff --git a/tests/texturing/texture-packed-formats.c b/tests/texturing/texture-packed-formats.c index a902c7aa..62e1c9ac 100644 --- a/tests/texturing/texture-packed-formats.c +++ b/tests/texturing/texture-packed-formats.c @@ -42,7 +42,7 @@ PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, 620 /*window_height*/, - GLUT_RGB | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE) struct pixel_format { const char *name; diff --git a/tests/texturing/texture-rg.c b/tests/texturing/texture-rg.c index 927a145e..a52e8238 100644 --- a/tests/texturing/texture-rg.c +++ b/tests/texturing/texture-rg.c @@ -32,7 +32,7 @@ PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, 128 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) static const char *TestName = "texture-rg"; diff --git a/tests/texturing/texwrap.c b/tests/texturing/texwrap.c index 34813d65..156638ca 100644 --- a/tests/texturing/texwrap.c +++ b/tests/texturing/texwrap.c @@ -389,7 +389,7 @@ static int border_x = 0, border_y = 0, border_z = 0; /* 0 or 1 */ PIGLIT_GL_TEST_MAIN( 872 /*window_width*/, 230 /*window_height*/, - GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE) + PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_ALPHA | PIGLIT_GL_VISUAL_DOUBLE) extern int piglit_automatic; diff --git a/tests/util/piglit-framework-fbo.c b/tests/util/piglit-framework-fbo.c index 8610724d..f9046d82 100644 --- a/tests/util/piglit-framework-fbo.c +++ b/tests/util/piglit-framework-fbo.c @@ -261,7 +261,7 @@ piglit_framework_fbo_gl_init(const struct piglit_gl_test_info *info) tex, 0); - if (info->window_visual & (GLUT_DEPTH | GLUT_STENCIL)) { + if (info->window_visual & (PIGLIT_GL_VISUAL_DEPTH | PIGLIT_GL_VISUAL_STENCIL)) { /* Create a combined depth+stencil texture and attach it * to the depth and stencil attachment points. */ diff --git a/tests/util/piglit-framework.h b/tests/util/piglit-framework.h index f93fcba8..917cdccd 100644 --- a/tests/util/piglit-framework.h +++ b/tests/util/piglit-framework.h @@ -29,6 +29,25 @@ #include <stdbool.h> /** + * A bitmask of these enums specifies visual attributes for the test's window. + * + * Each enum has the same value of its corresponding GLUT enum. That is, for + * each X, `PIGLIT_GL_VISUAL_X == GLUT_X`. + * + * \see piglit_gl_test_info::window_visual + */ +enum piglit_gl_visual { + PIGLIT_GL_VISUAL_RGB = 0, + PIGLIT_GL_VISUAL_RGBA = 0, + PIGLIT_GL_VISUAL_SINGLE = 0, + PIGLIT_GL_VISUAL_DOUBLE = 1 << 1, + PIGLIT_GL_VISUAL_ACCUM = 1 << 2, + PIGLIT_GL_VISUAL_ALPHA = 1 << 3, + PIGLIT_GL_VISUAL_DEPTH = 1 << 4, + PIGLIT_GL_VISUAL_STENCIL = 1 << 5, +}; + +/** * @brief Info needed to run an OpenGL test. * * To run a test, pass this to piglit_gl_test_run(). @@ -43,7 +62,9 @@ struct piglit_gl_test_info { int window_width; int window_height; - /** A bitmask such as `GLUT_RGBA | GLUT_DOUBLE`. */ + /** + * A bitmask of `enum piglit_gl_visual`. + */ int window_visual; /** |