diff options
Diffstat (limited to 'tests/spec')
255 files changed, 255 insertions, 255 deletions
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 8adca21d1..506d83c18 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 33987b145..01ebf36a8 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 c7933b83e..276ce70a2 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 6bdbb8ec2..a73fe6048 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 733404c63..7fedf9dec 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 bbb3d83a0..e789bb171 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 558b3c301..ddea5a95d 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 f71077c04..6d3386a0f 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 76564f8be..e219e29ec 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 5f61a39eb..e4e17dc70 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 288f22972..3f6b5a557 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 099846ea2..938aa3338 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 0746b90ef..a8b82b184 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 c4208e770..3f2c4f378 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 fe65338d9..acfdf3c45 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 b61688b5d..7ddf70b72 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 3a6025fdd..30cba2cfc 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 3ea9634fa..a9500c0ef 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 17a8a13a5..a52da0bd3 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 11c0df56f..4eb6d180d 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 8b88f5648..8ac37b58c 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 331f93f70..7718c983a 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 daa71d9fe..a939bd5c6 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 de8e8a2ce..547b75dbd 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 878bbd4c2..ed2f1af70 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 d099b9377..b6347c63d 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 b796ba9c4..7209c5890 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 bb6960550..92c6da75f 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 5d8f95dbc..3764f601d 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 139c91540..b2e63638a 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 e8c5bd024..509dbab9f 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 f0e1dc277..1aa4cd555 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 6247e9d8f..572efe224 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 2f362b07b..9232b8cbd 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 dbb9b3e77..3b6572e44 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 eb951bc5a..e79a18457 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 3b9bf1bed..c48a6c902 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 e9de8a422..79a9ae8b4 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 5c69898db..c92c4b55a 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 8fb639da3..dc73d4db1 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 a0fe41291..f19193813 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 f09c4a4ab..0cbacf380 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 d23f556e7..0716edd67 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 bdcc02e8c..b66f71155 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 35aa605a8..aa412de1f 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 393772256..042cb3a0a 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 cd5e22f17..22b045cb9 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 162525ca0..60386c3b1 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 2b17a53dc..00f6a5144 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 280244583..9615c3989 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 871d2977d..0cc7dbed3 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 63de8de9c..053d4fa36 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 d5a675fb1..2c6eadcba 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 833dcc8a2..d234191de 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 f4497de2b..b87718c44 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 317717028..9bfacef9c 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 a69a2589e..e81a4e2f4 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 b4abe3cd7..0c684c0ef 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 7086ac1d4..d8dd4554f 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 a812824bf..a0f3d782b 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 4e162ba9f..b3fefba6e 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 dd8e62df3..4faffda6c 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 8e2511b99..3e85dad84 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 ffbc4e131..e2f876646 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 22399c42a..ba3047595 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 c1a2f748c..9abc00d84 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 601712170..c959183fe 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 3885cd712..c6391dd7c 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 9f0b77a46..93825119a 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 9f29f6ed1..fa5d7ee33 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 7023aa8ba..f7b3ee6e1 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 828f1cf73..55c44b0cc 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 68f987fa1..6d0bce977 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 20dc60256..a55dd5e82 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 e0a503d59..5fbef71e5 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 dec8f8a48..98202b29f 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 a0c8bba91..1ec7f571d 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 9bd1c7460..00a7769df 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 398f64a21..14b526db6 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 1ebed2ece..d056474d4 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 c64395ee8..03ca9c6a1 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 556223a27..cd4a7e78a 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 cc788dc4f..94a874d60 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 a4a020da4..ef8163155 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 06a88d9c2..40dbfdeec 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 3208a19bd..28a179d6b 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 83a508a9b..1327991ef 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 4b50939b2..6b0583a22 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 9fe0ddf4b..884d6bada 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 c7db92a8b..eeef2c20b 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 ecff027d7..68069e5df 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 852a14eb6..9d3d7ab95 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 a5c5f24c9..4befc37f9 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 a7cb57bff..732b2a122 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 646002e50..e3c89e8d0 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 8f0245d38..13b86b61d 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 5841c035f..c6a918dfc 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 429b5740b..eeb208354 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 a8573aa33..c7a413c54 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 b28cc2df8..832e71ccd 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 590f2a7c1..e864ba7a9 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 185c373e0..246645c71 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 8f7c4a1e1..dc6f87d01 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 e884040d1..347a46603 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 cb5ecdea4..c814fd3fa 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 0f1e5f732..0a811a79c 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 6e2eda045..947813989 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 448019619..a80c434b5 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 9c253be1e..591055ac6 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 12c673424..ce6e56827 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 6109acdd9..7b24e952e 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 d6648a6bd..2fe93d490 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 6bdfc7cb4..baa976f13 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 243fd4f93..b1fef8392 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 461d17339..3a7bc2f68 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 032369908..3e2e70f5d 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 e29ed51fb..ce197120f 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 4b655ba92..4e44bebf7 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 12d8d7df1..1df1bc1b8 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 0590f9d62..cfea0514b 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 34adf8d43..a6f3e9af5 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 7e52e0f0b..5ded01970 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 013def3c6..66b5c3986 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 5f8db5d75..07d49f125 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 18ac8ebcb..a6ac00374 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 062af05a8..3f1602102 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 c0e1ea75c..a5a95e093 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 0919fd3fc..b72f633a1 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 cb56f3a11..5e3b050f7 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 4d1250eb6..5ce02af8f 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 4681c5c1c..dc410d469 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 e9775526f..fa8f3f089 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 b128dfcbf..6c78423ba 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 0ca77202b..e03f2cbbc 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 7dc26eef7..d7c733ab8 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 9f4a05583..9041ed0f4 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 31213f616..857a0568e 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 53127aa28..c49434a0b 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 108456329..85eeb4515 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 f242c9918..36d9f0ac5 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 cfd90e559..b92c98385 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 9827db8f4..6bb5d91a5 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 45db66f21..bccb1f5f5 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 bd4a8252f..f2ce36a1d 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 7cb515cae..66807c810 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 f460bae09..4bb3cfdfe 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 ff90539f1..60bb78650 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 ee37bed2e..8029abb42 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 6ffe25fb4..a24ca3e27 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 ab6fea778..787c0e464 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 dfc792e3d..a6333c4fa 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 b7ded7c21..995c5044a 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 f2ae5c78f..ee9368345 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 9be96216e..5ef872a99 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 8dcd983ed..543d63496 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 c04241d89..12acbb3e7 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 692e8b256..c6cf68b40 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 38e4ae9e5..d3823e0d3 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 85a08d5fa..e3e8d9987 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 3172a74ba..83c8daac7 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 3e5eab730..3903f3d2c 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 0acbd1777..656714e4f 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 b84c14d10..bfe2ff6fb 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 b1b0b43aa..4bef055e1 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 748c86b08..ae0063b1b 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 8e0469b01..975a73173 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 9e9eff87a..60a7385fd 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 07caed687..19b12d118 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 7545416b0..c26753554 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 c9409aabf..7541267a4 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 d8ba4148b..767061e21 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 4ba3cf457..4ce29db78 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 df3e71a0d..e41168830 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 62f7e2a2a..7a360db11 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 0f031eea1..e320d7216 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 49b2f0ef1..c2f3200b0 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 46025e7c7..074ca6402 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 c473fe5c3..4e55cbd09 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 c6dad961d..339544d72 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 1dd84639f..3541fc4ed 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 585e9d223..cb85acd27 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 9bfb20f3c..08bcbd82c 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 8cac71d3d..765c84d23 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 136e62f49..d7817d4db 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 8cd79e646..c0a634bcb 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 17628cbee..f05657e44 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 943f206b8..1a2f68e43 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 54fe8523a..12c225a6e 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 afd88655e..92da0b091 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 b71e4128e..40d73251a 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 699ef94c8..0d857ce6f 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 6c0e2567d..f8053a446 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 bec053854..744b3bd95 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 04c7cae8b..1506d1d44 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 0bb583318..6228cb1ce 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 45c3922c5..b2767c1fa 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 e6e89d8a6..a6dae9c3c 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 c6d0194b6..bebf21198 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 57a9d672d..405c918b5 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 fe7dba582..55c919f2a 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 37b5fceac..ba5c07060 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 f83b3f8cb..96166775d 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 c1c20f27a..f420a4550 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 a32e7dd54..6f2e01d34 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 0fb085261..0b635411b 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 8f769eb05..dbe99a312 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 fbf30c1d6..4c6b2e924 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 82b96a0a0..c2cf18db8 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 edb32a23c..384dac384 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 b6dbfc786..f8116c833 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 0e87cf7e9..e580328ba 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 8a87ffcad..1afcd65f1 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 f016b5866..b41a99f68 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 a81c53ea4..cbc86e443 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 4ab765bce..23e381bb5 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 a85bae9ce..608f7dc33 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 90e330a38..7dc99a60c 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 7bcf83ab9..a295e74be 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 d6896596d..eae9592ff 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 20bb2e2e4..e0f64c472 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 8a5fa76ac..d1c1dfbce 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 4fad5e1a5..3e6f55ef3 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 e9b0a682e..15d38f3fe 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 9fed5b6a0..e18d7409f 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 1ff270ba0..cfc8c613c 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 9887d4f55..2a8aac04f 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 e2a5912af..19f485dfa 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 52f1ba5d0..ed975ef58 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 fd68cbb72..1cfa05b72 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 dfdf50b9e..941d1595d 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 89a1ed42b..d9d03add7 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 8d7865e46..1d09e52f4 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 8a5aa94d0..86c24b481 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 8c62e8b76..410a8991d 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 f197eff1f..ea82e02c0 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 3210830f3..f4852c404 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 17119d7d3..7a49d20e7 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 f86706ea0..7f067dfd6 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 1bd4b7921..23cbb8e0a 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 b7aab6fbd..e1519c029 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 ceda6558c..311229401 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 5b9d487d5..b330d9521 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 8bc26b96e..22883f1d9 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 f87e81790..c83eb0a34 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 8fd7dfa06..3baa45d9c 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 1a70b5c74..254ebaa55 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 75286b5d3..c2202a3ef 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 d56b6c836..97f4ac056 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 abc8497ca..0bfbcd2e8 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 b5d97dba1..8fd96c298 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 893e0a354..6d9d00ff5 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 fbebce2a0..9fdd35384 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 cecd327bc..2ee90e007 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 4d433c3ed..39a734db4 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 44599e559..b9f91fe07 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 }; |