Convert all glutSwapBuffers to piglit_present_results

V2: Don't break tests/general/read-front

Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

35 files changed, 35 insertions, 35 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 7ec34a4b8..8adca21d1 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
@@ -116,7 +116,7 @@ enum piglit_result piglit_display(void)
    pass = piglit_probe_pixel_rgb(200, 50, violet) && pass;
    pass = piglit_probe_pixel_rgb(230, 50, violet) && pass;
 
-   glutSwapBuffers();
+   piglit_present_results();
 
    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
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 870abcc2a..8b88f5648 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
@@ -186,7 +186,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
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 ec1e524a7..d099b9377 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c
@@ -80,7 +80,7 @@ piglit_display(void)
 	pass = piglit_probe_pixel_rgb(piglit_width * 3 / 4, piglit_height / 2,
 				      blue) && pass;
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 #else
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 7130aaa5b..e281108d2 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
@@ -138,7 +138,7 @@ piglit_display(void)
 		pass = piglit_probe_pixel_rgba(opos[i*2]+25, opos[i*2+1]+25, &ocol[i*4]) && pass;
 	}
 
- 	glutSwapBuffers();
+ 	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
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 2ed7dd7d1..69fb69173 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
@@ -104,7 +104,7 @@ piglit_display(void)
 
 	assert(!glGetError());
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 #else
diff --git a/tests/spec/arb_instanced_arrays/instanced_arrays.c b/tests/spec/arb_instanced_arrays/instanced_arrays.c
index 3d1a1b15e..a0fe41291 100644
--- a/tests/spec/arb_instanced_arrays/instanced_arrays.c
+++ b/tests/spec/arb_instanced_arrays/instanced_arrays.c
@@ -158,7 +158,7 @@ test_instancing(GLuint divisor)
                     TestName, i);
             fprintf(stderr, "%s: color instance divisor = %u\n",
                     TestName, divisor);
-            glutSwapBuffers();
+            piglit_present_results();
             return GL_FALSE;
          }
       }
diff --git a/tests/spec/arb_sampler_objects/sampler-incomplete.c b/tests/spec/arb_sampler_objects/sampler-incomplete.c
index 75d195538..2b17a53dc 100644
--- a/tests/spec/arb_sampler_objects/sampler-incomplete.c
+++ b/tests/spec/arb_sampler_objects/sampler-incomplete.c
@@ -127,7 +127,7 @@ piglit_display(void)
 	p = piglit_probe_pixel_rgb(piglit_width / 2, piglit_height / 2,
 				   expected);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return p ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/spec/arb_sampler_objects/sampler-objects.c b/tests/spec/arb_sampler_objects/sampler-objects.c
index f7937be0f..280244583 100644
--- a/tests/spec/arb_sampler_objects/sampler-objects.c
+++ b/tests/spec/arb_sampler_objects/sampler-objects.c
@@ -213,7 +213,7 @@ test_samplers(void)
 
       p = piglit_probe_pixel_rgba(10, 10, exp);
 
-      glutSwapBuffers();
+      piglit_present_results();
 
       if (!p) {
          fprintf(stderr, "%s failed for sampler %d\n", Prog, i);
diff --git a/tests/spec/arb_shader_texture_lod/execution/texgrad.c b/tests/spec/arb_shader_texture_lod/execution/texgrad.c
index 629b0b527..7086ac1d4 100644
--- a/tests/spec/arb_shader_texture_lod/execution/texgrad.c
+++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c
@@ -180,7 +180,7 @@ enum piglit_result piglit_display(void)
 	if (!piglit_probe_rect_halves_equal_rgba(0, 0, piglit_width, piglit_height))
 		pass = GL_FALSE;
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/spec/arb_texture_float/texture-float-formats.c b/tests/spec/arb_texture_float/texture-float-formats.c
index 978ef815c..a0c8bba91 100644
--- a/tests/spec/arb_texture_float/texture-float-formats.c
+++ b/tests/spec/arb_texture_float/texture-float-formats.c
@@ -337,7 +337,7 @@ test_format(const struct format_info *info)
       printf("\n");
    }
 
-   glutSwapBuffers();
+   piglit_present_results();
 
    return p;
 }
diff --git a/tests/spec/arb_texture_storage/texture-storage.c b/tests/spec/arb_texture_storage/texture-storage.c
index 959d13982..c10546e85 100644
--- a/tests/spec/arb_texture_storage/texture-storage.c
+++ b/tests/spec/arb_texture_storage/texture-storage.c
@@ -313,7 +313,7 @@ test_2d_mipmap_rendering(void)
 		p = piglit_probe_pixel_rgb(piglit_width/2, piglit_height/2,
 					   expected);
 
-		glutSwapBuffers();
+		piglit_present_results();
 
 		if (!p) {
 			printf("%s: wrong color for mipmap level %d\n",
diff --git a/tests/spec/arb_transform_feedback2/draw-auto.c b/tests/spec/arb_transform_feedback2/draw-auto.c
index e7fe8bb8a..01780a9f0 100644
--- a/tests/spec/arb_transform_feedback2/draw-auto.c
+++ b/tests/spec/arb_transform_feedback2/draw-auto.c
@@ -198,7 +198,7 @@ enum piglit_result piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
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 3e0c9396c..6109acdd9 100644
--- a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c
+++ b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c
@@ -104,7 +104,7 @@ piglit_display(void)
 				      piglit_width / 2, piglit_height / 2,
 				      blue) && pass;
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDisableClientState(GL_VERTEX_ARRAY);
 	glDisableClientState(GL_COLOR_ARRAY);
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 0b46cafaf..d6648a6bd 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
@@ -101,7 +101,7 @@ piglit_display(void)
 
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDisableClientState(GL_VERTEX_ARRAY);
 	glDeleteBuffersARB(1, &vbo);
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 82e4f0372..6c4f11610 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
@@ -226,7 +226,7 @@ piglit_display(void)
     }
 
     glFinish();
-    glutSwapBuffers();
+    piglit_present_results();
 
     return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/spec/ati_draw_buffers/arbfp-no-index.c b/tests/spec/ati_draw_buffers/arbfp-no-index.c
index d3f10f5de..e29ed51fb 100644
--- a/tests/spec/ati_draw_buffers/arbfp-no-index.c
+++ b/tests/spec/ati_draw_buffers/arbfp-no-index.c
@@ -141,7 +141,7 @@ piglit_display(void)
 	pass = pass && piglit_probe_rect_rgba(piglit_width / 2, 0, piglit_width / 2, piglit_height,
 					     result1);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/spec/ati_draw_buffers/arbfp-no-option.c b/tests/spec/ati_draw_buffers/arbfp-no-option.c
index 3c3212fe9..4b655ba92 100644
--- a/tests/spec/ati_draw_buffers/arbfp-no-option.c
+++ b/tests/spec/ati_draw_buffers/arbfp-no-option.c
@@ -127,7 +127,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/spec/ati_draw_buffers/arbfp.c b/tests/spec/ati_draw_buffers/arbfp.c
index 496c43e9b..12d8d7df1 100644
--- a/tests/spec/ati_draw_buffers/arbfp.c
+++ b/tests/spec/ati_draw_buffers/arbfp.c
@@ -133,7 +133,7 @@ piglit_display(void)
 	pass = pass && piglit_probe_rect_rgba(piglit_width / 2, 0, piglit_width / 2, piglit_height,
 					     result1);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/spec/ati_envmap_bumpmap/bump.c b/tests/spec/ati_envmap_bumpmap/bump.c
index e6c95b850..0590f9d62 100644
--- a/tests/spec/ati_envmap_bumpmap/bump.c
+++ b/tests/spec/ati_envmap_bumpmap/bump.c
@@ -181,7 +181,7 @@ piglit_display(void)
 					      piglit_height / 2,
 					      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/spec/ext_fog_coord/modes.c b/tests/spec/ext_fog_coord/modes.c
index e0ef6f44b..34adf8d43 100644
--- a/tests/spec/ext_fog_coord/modes.c
+++ b/tests/spec/ext_fog_coord/modes.c
@@ -119,7 +119,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
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 9b97b063f..62f7e2a2a 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
@@ -258,7 +258,7 @@ test_fbo(const struct format_info *info)
       }
    }
 
-   glutSwapBuffers();
+   piglit_present_results();
 
    glDeleteTextures(1, &texObj);
    glDeleteFramebuffers(1, &fbo);
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 ba7f7ca6a..dfdf50b9e 100644
--- a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c
+++ b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c
@@ -103,7 +103,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
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 5211377f2..89a1ed42b 100644
--- a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c
+++ b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c
@@ -107,7 +107,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/spec/nv_conditional_render/bitmap.c b/tests/spec/nv_conditional_render/bitmap.c
index af38ca03c..2e54d7b33 100644
--- a/tests/spec/nv_conditional_render/bitmap.c
+++ b/tests/spec/nv_conditional_render/bitmap.c
@@ -88,7 +88,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 	free(buf);
diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c
index 77269fc23..f45e4c163 100644
--- a/tests/spec/nv_conditional_render/blitframebuffer.c
+++ b/tests/spec/nv_conditional_render/blitframebuffer.c
@@ -121,7 +121,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c
index aefeed9e1..1884ad0be 100644
--- a/tests/spec/nv_conditional_render/clear.c
+++ b/tests/spec/nv_conditional_render/clear.c
@@ -82,7 +82,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c
index 59b732e16..4ffd8aff8 100644
--- a/tests/spec/nv_conditional_render/copypixels.c
+++ b/tests/spec/nv_conditional_render/copypixels.c
@@ -84,7 +84,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &qfail);
 	glDeleteQueries(1, &qpass);
diff --git a/tests/spec/nv_conditional_render/copyteximage.c b/tests/spec/nv_conditional_render/copyteximage.c
index a014d1dea..e8d1c7cf2 100644
--- a/tests/spec/nv_conditional_render/copyteximage.c
+++ b/tests/spec/nv_conditional_render/copyteximage.c
@@ -106,7 +106,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c
index 3449fa052..675e4fff7 100644
--- a/tests/spec/nv_conditional_render/copytexsubimage.c
+++ b/tests/spec/nv_conditional_render/copytexsubimage.c
@@ -106,7 +106,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/dlist.c
index fe6265036..e33ea1299 100644
--- a/tests/spec/nv_conditional_render/dlist.c
+++ b/tests/spec/nv_conditional_render/dlist.c
@@ -77,7 +77,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/drawpixels.c b/tests/spec/nv_conditional_render/drawpixels.c
index ddb45108e..371d8e806 100644
--- a/tests/spec/nv_conditional_render/drawpixels.c
+++ b/tests/spec/nv_conditional_render/drawpixels.c
@@ -98,7 +98,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 	free(buf);
diff --git a/tests/spec/nv_conditional_render/generatemipmap.c b/tests/spec/nv_conditional_render/generatemipmap.c
index 8c55e9ae3..90ce8f6d8 100644
--- a/tests/spec/nv_conditional_render/generatemipmap.c
+++ b/tests/spec/nv_conditional_render/generatemipmap.c
@@ -105,7 +105,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_conditional_render/vertex_array.c b/tests/spec/nv_conditional_render/vertex_array.c
index b75c147b5..25b387f19 100644
--- a/tests/spec/nv_conditional_render/vertex_array.c
+++ b/tests/spec/nv_conditional_render/vertex_array.c
@@ -82,7 +82,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteQueries(1, &q);
 
diff --git a/tests/spec/nv_texture_barrier/blending-in-shader.c b/tests/spec/nv_texture_barrier/blending-in-shader.c
index d3d1642cc..893e0a354 100644
--- a/tests/spec/nv_texture_barrier/blending-in-shader.c
+++ b/tests/spec/nv_texture_barrier/blending-in-shader.c
@@ -73,7 +73,7 @@ enum piglit_result piglit_display(void)
 
 	piglit_draw_rect_tex(-1, -1, 2, 2, 0, 0, 1, 1);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/spec/oes_draw_texture/oes_draw_texture.c b/tests/spec/oes_draw_texture/oes_draw_texture.c
index ff6068393..44599e559 100644
--- a/tests/spec/oes_draw_texture/oes_draw_texture.c
+++ b/tests/spec/oes_draw_texture/oes_draw_texture.c
@@ -213,7 +213,7 @@ piglit_display(void)
 	pass = test_depth() && pass;
 
 	glFinish();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }