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>

41 files changed, 45 insertions, 45 deletions

diff --git a/tests/texturing/array-texture.c b/tests/texturing/array-texture.c
index e175e396..b5d216a4 100644
--- a/tests/texturing/array-texture.c
+++ b/tests/texturing/array-texture.c
@@ -320,7 +320,7 @@ piglit_display(void)
       check_error(__LINE__);
    }
 
-   glutSwapBuffers();
+   piglit_present_results();
    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
diff --git a/tests/texturing/crossbar.c b/tests/texturing/crossbar.c
index be931633..4bec7aa4 100644
--- a/tests/texturing/crossbar.c
+++ b/tests/texturing/crossbar.c
@@ -148,7 +148,7 @@ piglit_display(void)
 {
    if (piglit_automatic) {
       DoFrame();
-      glutSwapBuffers();
+      piglit_present_results();
       return PIGLIT_PASS;
    } else {
       int success, retry;
@@ -156,7 +156,7 @@ piglit_display(void)
       printf("\nFirst frame\n-----------\n");
       DoFrame();
       success = DoTest();
-      glutSwapBuffers();
+      piglit_present_results();
 
       printf("\nSecond frame\n------------\n");
       glMatrixMode( GL_PROJECTION );
@@ -167,7 +167,7 @@ piglit_display(void)
 
       DoFrame();
       retry = DoTest();
-      glutSwapBuffers();
+      piglit_present_results();
 
       if (retry && success)
           return PIGLIT_PASS;
diff --git a/tests/texturing/cubemap.c b/tests/texturing/cubemap.c
index 7d056905..fe3d9b63 100644
--- a/tests/texturing/cubemap.c
+++ b/tests/texturing/cubemap.c
@@ -269,7 +269,7 @@ piglit_display(void)
 		i++;
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/depth-level-clamp.c b/tests/texturing/depth-level-clamp.c
index deed0842..c9a91b61 100644
--- a/tests/texturing/depth-level-clamp.c
+++ b/tests/texturing/depth-level-clamp.c
@@ -153,7 +153,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/depth-tex-compare.c b/tests/texturing/depth-tex-compare.c
index 2d0780b1..d44a0024 100644
--- a/tests/texturing/depth-tex-compare.c
+++ b/tests/texturing/depth-tex-compare.c
@@ -241,7 +241,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	printf("Left to Right: ALPHA, LUMINANCE, INTENSITY\n");
 	printf("Top to Bottom: LESS, LEQUAL, GREATER, GEQUAL, "
diff --git a/tests/texturing/depth-tex-modes-common.c b/tests/texturing/depth-tex-modes-common.c
index 9ee1302b..c57c8c86 100644
--- a/tests/texturing/depth-tex-modes-common.c
+++ b/tests/texturing/depth-tex-modes-common.c
@@ -234,7 +234,7 @@ depth_tex_display(const GLenum *depth_texture_modes, unsigned num_modes,
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/depth-tex-modes-glsl.c b/tests/texturing/depth-tex-modes-glsl.c
index 715b3ba3..ba718b46 100644
--- a/tests/texturing/depth-tex-modes-glsl.c
+++ b/tests/texturing/depth-tex-modes-glsl.c
@@ -308,7 +308,7 @@ piglit_display(void)
 	}
 
 	glFinish();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 
diff --git a/tests/texturing/fragment-and-vertex-texturing.c b/tests/texturing/fragment-and-vertex-texturing.c
index 4258c0cd..1e98e619 100644
--- a/tests/texturing/fragment-and-vertex-texturing.c
+++ b/tests/texturing/fragment-and-vertex-texturing.c
@@ -165,7 +165,7 @@ piglit_display(void)
 
 	pass = piglit_probe_pixel_rgb(1, 1, expected);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/fxt1-teximage.c b/tests/texturing/fxt1-teximage.c
index 5dc87fc8..112037cb 100644
--- a/tests/texturing/fxt1-teximage.c
+++ b/tests/texturing/fxt1-teximage.c
@@ -124,7 +124,7 @@ piglit_display(void)
 	pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 0);
 	pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 1);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/gen-compressed-teximage.c b/tests/texturing/gen-compressed-teximage.c
index aa13d3a6..58a21b93 100644
--- a/tests/texturing/gen-compressed-teximage.c
+++ b/tests/texturing/gen-compressed-teximage.c
@@ -154,7 +154,7 @@ piglit_display(void)
 	pass = pass && check_resulting_mipmaps(0, SIZE, blue);
 	pass = pass && check_resulting_mipmaps(0, SIZE * 2, red);
 
-	glutSwapBuffers();
+	piglit_present_results();
 	glFlush();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
diff --git a/tests/texturing/gen-nonzero-unit.c b/tests/texturing/gen-nonzero-unit.c
index f035206a..2b641de5 100644
--- a/tests/texturing/gen-nonzero-unit.c
+++ b/tests/texturing/gen-nonzero-unit.c
@@ -163,7 +163,7 @@ piglit_display(void)
 	pass = pass && check_resulting_mipmaps(0, SIZE, blue);
 	pass = pass && check_resulting_mipmaps(0, SIZE * 2, red);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteTextures(3, textures);
 
diff --git a/tests/texturing/gen-teximage.c b/tests/texturing/gen-teximage.c
index d4ed84f4..243b5e9b 100644
--- a/tests/texturing/gen-teximage.c
+++ b/tests/texturing/gen-teximage.c
@@ -151,7 +151,7 @@ piglit_display(void)
 	pass = pass && check_resulting_mipmaps(0, SIZE, blue);
 	pass = pass && check_resulting_mipmaps(0, SIZE * 2, red);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteTextures(1, &texture);
 
diff --git a/tests/texturing/gen-texsubimage.c b/tests/texturing/gen-texsubimage.c
index 17002c9b..2ac21c71 100644
--- a/tests/texturing/gen-texsubimage.c
+++ b/tests/texturing/gen-texsubimage.c
@@ -129,7 +129,7 @@ piglit_display(void)
 	pass = pass && check_resulting_mipmaps(0, 0, blue);
 	pass = pass && check_resulting_mipmaps(0, 256, red);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteTextures(1, &texture);
 
diff --git a/tests/texturing/getteximage-formats.c b/tests/texturing/getteximage-formats.c
index 8f4101d8..1fe74dc6 100644
--- a/tests/texturing/getteximage-formats.c
+++ b/tests/texturing/getteximage-formats.c
@@ -442,7 +442,7 @@ test_format(const struct test_desc *test,
 
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass;
 }
@@ -513,7 +513,7 @@ piglit_display(void)
 			glClear(GL_COLOR_BUFFER_BIT);
 			draw_format_text(set, &set->format[format_index]);
 			draw_unsupported();
-			glutSwapBuffers();
+			piglit_present_results();
 		}
 	}
 
diff --git a/tests/texturing/getteximage-simple.c b/tests/texturing/getteximage-simple.c
index e4b464e4..46afde5d 100644
--- a/tests/texturing/getteximage-simple.c
+++ b/tests/texturing/getteximage-simple.c
@@ -59,7 +59,7 @@ piglit_display(void)
 	glVertex2f(0, 1);
 	glEnd();
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	pass = test_getteximage();
 
diff --git a/tests/texturing/levelclamp.c b/tests/texturing/levelclamp.c
index f8bac547..3d450007 100644
--- a/tests/texturing/levelclamp.c
+++ b/tests/texturing/levelclamp.c
@@ -187,7 +187,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c
index e91e2d4b..310f7aa0 100644
--- a/tests/texturing/lodbias.c
+++ b/tests/texturing/lodbias.c
@@ -146,7 +146,7 @@ test_simple(int bias1, int bias2)
 	glDisable(GL_TEXTURE_2D);
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return pass;
 }
@@ -222,7 +222,7 @@ test_multitex(int bias1, int bias2)
 	glDisable(GL_TEXTURE_2D);
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return pass;
 }
diff --git a/tests/texturing/lodclamp-between-max.c b/tests/texturing/lodclamp-between-max.c
index 58b4e3a4..567dfbd5 100644
--- a/tests/texturing/lodclamp-between-max.c
+++ b/tests/texturing/lodclamp-between-max.c
@@ -142,7 +142,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/lodclamp-between.c b/tests/texturing/lodclamp-between.c
index 80ffce86..d69c9cfe 100644
--- a/tests/texturing/lodclamp-between.c
+++ b/tests/texturing/lodclamp-between.c
@@ -142,7 +142,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/lodclamp.c b/tests/texturing/lodclamp.c
index a55f74d6..0150e2e4 100644
--- a/tests/texturing/lodclamp.c
+++ b/tests/texturing/lodclamp.c
@@ -187,7 +187,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/mipmap-setup.c b/tests/texturing/mipmap-setup.c
index ae8e719e..18712d65 100644
--- a/tests/texturing/mipmap-setup.c
+++ b/tests/texturing/mipmap-setup.c
@@ -155,7 +155,7 @@ test(enum order ord, const char *order)
 
       pass &= p;
       
-      glutSwapBuffers();
+      piglit_present_results();
    }
 
    return pass;
diff --git a/tests/texturing/rg-draw-pixels.c b/tests/texturing/rg-draw-pixels.c
index 2e3e4d79..38b0e24d 100644
--- a/tests/texturing/rg-draw-pixels.c
+++ b/tests/texturing/rg-draw-pixels.c
@@ -99,7 +99,7 @@ piglit_display(void)
 	pass = pass && piglit_probe_pixel_rgb(20,0,rg);
 	pass = pass && piglit_probe_pixel_rgb(21,0,rg);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 
diff --git a/tests/texturing/rg-teximage-common.c b/tests/texturing/rg-teximage-common.c
index 72e1e5f0..2d097492 100644
--- a/tests/texturing/rg-teximage-common.c
+++ b/tests/texturing/rg-teximage-common.c
@@ -59,7 +59,7 @@ piglit_display(void)
 				     0.0, 0.0, 1.0, 1.0);
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
diff --git a/tests/texturing/s3tc-teximage.c b/tests/texturing/s3tc-teximage.c
index 5583fe70..01e2e97b 100644
--- a/tests/texturing/s3tc-teximage.c
+++ b/tests/texturing/s3tc-teximage.c
@@ -133,7 +133,7 @@ piglit_display(void)
 	pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 2);
 	pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 3);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/s3tc-texsubimage.c b/tests/texturing/s3tc-texsubimage.c
index 8b508b83..b575d8b7 100644
--- a/tests/texturing/s3tc-texsubimage.c
+++ b/tests/texturing/s3tc-texsubimage.c
@@ -210,7 +210,7 @@ piglit_display(void)
 	pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 2);
 	pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 3);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/streaming-texture-leak.c b/tests/texturing/streaming-texture-leak.c
index c085a9d2..5c2d1004 100644
--- a/tests/texturing/streaming-texture-leak.c
+++ b/tests/texturing/streaming-texture-leak.c
@@ -75,7 +75,7 @@ piglit_display(void)
 	pass = piglit_probe_pixel_rgb(piglit_width / 2, piglit_height / 2,
 				      expected);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/tex-border-1.c b/tests/texturing/tex-border-1.c
index a8b8e25a..6d8616b1 100644
--- a/tests/texturing/tex-border-1.c
+++ b/tests/texturing/tex-border-1.c
@@ -91,7 +91,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c
index ddce3f7a..9e7421c6 100644
--- a/tests/texturing/tex-miplevel-selection.c
+++ b/tests/texturing/tex-miplevel-selection.c
@@ -321,7 +321,7 @@ piglit_display(void)
 	}
 	printf("Summary: %i/%i passed\n", total-failed, total);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return !failed ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/tex-skipped-unit.c b/tests/texturing/tex-skipped-unit.c
index e61a6af2..6668770b 100644
--- a/tests/texturing/tex-skipped-unit.c
+++ b/tests/texturing/tex-skipped-unit.c
@@ -122,7 +122,7 @@ piglit_display(void)
 					      piglit_height / 2,
 					      white);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/tex-srgb.c b/tests/texturing/tex-srgb.c
index 655dc73d..1c2bf14a 100644
--- a/tests/texturing/tex-srgb.c
+++ b/tests/texturing/tex-srgb.c
@@ -140,7 +140,7 @@ srgb_tex_test(int srgb_format)
 
 
 	glDeleteTextures(1, &tex);
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass;
 }
diff --git a/tests/texturing/tex-swizzle.c b/tests/texturing/tex-swizzle.c
index 9fa6da92..0f805687 100644
--- a/tests/texturing/tex-swizzle.c
+++ b/tests/texturing/tex-swizzle.c
@@ -218,7 +218,7 @@ piglit_display(void)
 	pass = probes();
 
 	glFinish();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c
index 452019c9..626a46df 100644
--- a/tests/texturing/tex3d-maxsize.c
+++ b/tests/texturing/tex3d-maxsize.c
@@ -174,7 +174,7 @@ piglit_display(void)
 				      piglit_height * 3 / 4, c1) && pass;
 	pass = piglit_probe_pixel_rgb(piglit_width * 3 / 4,
 				      piglit_height * 3 / 4, c2) && pass;
-	glutSwapBuffers();
+	piglit_present_results();
 
 	if (!pass) {
 		printf("%s: failed at size %d x %d x %d\n", TestName,
diff --git a/tests/texturing/tex3d-npot.c b/tests/texturing/tex3d-npot.c
index f79b0275..85919558 100644
--- a/tests/texturing/tex3d-npot.c
+++ b/tests/texturing/tex3d-npot.c
@@ -148,7 +148,7 @@ static int render_and_check(int w, int h, int d, GLenum format, float q, unsigne
     }
     free(readback);
 
-    glutSwapBuffers();
+    piglit_present_results();
     return 1;
 }
 
diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c
index 72d8313b..e990057a 100644
--- a/tests/texturing/tex3d.c
+++ b/tests/texturing/tex3d.c
@@ -148,7 +148,7 @@ static int render_and_check(int w, int h, int d, GLenum format, float q, unsigne
 	}
 	free(readback);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return 1;
 }
diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c
index 0c77d77e..2be7dc1d 100644
--- a/tests/texturing/texdepth.c
+++ b/tests/texturing/texdepth.c
@@ -339,7 +339,7 @@ piglit_display(void)
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	Tests[CurrentTest].func(Tests[CurrentTest].param);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return PIGLIT_PASS;
 }
diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c
index f41a9520..11e75d0f 100644
--- a/tests/texturing/texrect-many.c
+++ b/tests/texturing/texrect-many.c
@@ -93,7 +93,7 @@ piglit_display(void)
 	DoFrame();
 	pass = DoTest();
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/texredefine.c b/tests/texturing/texredefine.c
index 6879689d..9c69b276 100644
--- a/tests/texturing/texredefine.c
+++ b/tests/texturing/texredefine.c
@@ -196,7 +196,7 @@ piglit_display(void)
 	}
 
 	glDisable(GL_TEXTURE_2D);
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/texturing/texsubimage.c b/tests/texturing/texsubimage.c
index a92ea92a..f2ca3ece 100644
--- a/tests/texturing/texsubimage.c
+++ b/tests/texturing/texsubimage.c
@@ -305,7 +305,7 @@ test_format(GLenum target, GLenum intFormat)
 		piglit_draw_rect_tex3d(0, 0, w, h, 0.0, 0.0, 1.0, 1.0, 0.0, 1.0);
 		glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, testImg);
 
-		glutSwapBuffers();
+		piglit_present_results();
 
 		if (!equal_images(ref, testImg, w, h)) {
 			printf("texsubimage failed\n");
diff --git a/tests/texturing/texture-al.c b/tests/texturing/texture-al.c
index 339bfaef..5706c1e8 100644
--- a/tests/texturing/texture-al.c
+++ b/tests/texturing/texture-al.c
@@ -173,7 +173,7 @@ test_teximage_formats(void)
          return GL_FALSE;
       }
 
-      glutSwapBuffers();
+      piglit_present_results();
    }
 
    free(image);
diff --git a/tests/texturing/texture-packed-formats.c b/tests/texturing/texture-packed-formats.c
index 9fd597d6..91e0a2fa 100644
--- a/tests/texturing/texture-packed-formats.c
+++ b/tests/texturing/texture-packed-formats.c
@@ -371,7 +371,7 @@ Test(GLuint intFmt, GLuint dims)
       glPopMatrix();
    }
 
-   glutSwapBuffers();
+   piglit_present_results();
 
    return pass;
 }
diff --git a/tests/texturing/texture-rg.c b/tests/texturing/texture-rg.c
index 84a5f9b8..927a145e 100644
--- a/tests/texturing/texture-rg.c
+++ b/tests/texturing/texture-rg.c
@@ -225,7 +225,7 @@ test_teximage_formats(void)
          return GL_FALSE;
       }
 
-      glutSwapBuffers();
+      piglit_present_results();
    }
 
    free(image);