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>

97 files changed, 97 insertions, 97 deletions

diff --git a/tests/shaders/attribute0.c b/tests/shaders/attribute0.c
index d3bdf9c0..e8643251 100644
--- a/tests/shaders/attribute0.c
+++ b/tests/shaders/attribute0.c
@@ -64,7 +64,7 @@ piglit_display(void)
 
 	assert(!glGetError());
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/fp-abs-01.c b/tests/shaders/fp-abs-01.c
index d8ee2551..8de36cd4 100644
--- a/tests/shaders/fp-abs-01.c
+++ b/tests/shaders/fp-abs-01.c
@@ -139,7 +139,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/fp-abs-02.c b/tests/shaders/fp-abs-02.c
index 83b9e91e..a2c5095a 100644
--- a/tests/shaders/fp-abs-02.c
+++ b/tests/shaders/fp-abs-02.c
@@ -161,7 +161,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/fp-condition_codes-01.c b/tests/shaders/fp-condition_codes-01.c
index ababf148..8f016834 100644
--- a/tests/shaders/fp-condition_codes-01.c
+++ b/tests/shaders/fp-condition_codes-01.c
@@ -229,7 +229,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/fp-fog.c b/tests/shaders/fp-fog.c
index d5292714..23515443 100644
--- a/tests/shaders/fp-fog.c
+++ b/tests/shaders/fp-fog.c
@@ -107,7 +107,7 @@ piglit_display(void)
 						expected_color);
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/fp-formats.c b/tests/shaders/fp-formats.c
index 63779ffb..db2ca74e 100644
--- a/tests/shaders/fp-formats.c
+++ b/tests/shaders/fp-formats.c
@@ -69,7 +69,7 @@ piglit_display(void)
 				    expected))
 	  result = PIGLIT_FAIL;
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/fp-fragment-position.c b/tests/shaders/fp-fragment-position.c
index a3cbd891..3a135ba1 100644
--- a/tests/shaders/fp-fragment-position.c
+++ b/tests/shaders/fp-fragment-position.c
@@ -252,7 +252,7 @@ piglit_display(void)
 	pass = DoTest();
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
diff --git a/tests/shaders/fp-incomplete-tex.c b/tests/shaders/fp-incomplete-tex.c
index 665f7d73..3605d23f 100644
--- a/tests/shaders/fp-incomplete-tex.c
+++ b/tests/shaders/fp-incomplete-tex.c
@@ -179,7 +179,7 @@ piglit_display(void)
 
 	DoFrame();
 	pass = DoTest();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/fp-kil.c b/tests/shaders/fp-kil.c
index 117114a2..06e93f31 100644
--- a/tests/shaders/fp-kil.c
+++ b/tests/shaders/fp-kil.c
@@ -253,7 +253,7 @@ piglit_display(void)
 
 	DoFrame();
 	pass = DoTest();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/fp-lit-mask.c b/tests/shaders/fp-lit-mask.c
index 217e0ee5..4cc50229 100644
--- a/tests/shaders/fp-lit-mask.c
+++ b/tests/shaders/fp-lit-mask.c
@@ -114,7 +114,7 @@ piglit_display(void)
 
 	DoFrame();
 	pass = DoTest();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/fp-lit-src-equals-dst.c b/tests/shaders/fp-lit-src-equals-dst.c
index 052d02e8..49ffcaa2 100644
--- a/tests/shaders/fp-lit-src-equals-dst.c
+++ b/tests/shaders/fp-lit-src-equals-dst.c
@@ -108,7 +108,7 @@ piglit_display(void)
 	DoFrame();
 	pass = DoTest();
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/fp-rfl.c b/tests/shaders/fp-rfl.c
index 4c644925..b61c8a31 100644
--- a/tests/shaders/fp-rfl.c
+++ b/tests/shaders/fp-rfl.c
@@ -165,7 +165,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/fp-set-01.c b/tests/shaders/fp-set-01.c
index a5280e9f..72a0968c 100644
--- a/tests/shaders/fp-set-01.c
+++ b/tests/shaders/fp-set-01.c
@@ -126,7 +126,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/fp-set-02.c b/tests/shaders/fp-set-02.c
index 5b019b4a..fff001f2 100644
--- a/tests/shaders/fp-set-02.c
+++ b/tests/shaders/fp-set-02.c
@@ -222,7 +222,7 @@ piglit_display(void)
 	}
 
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/fp-unpack-01.c b/tests/shaders/fp-unpack-01.c
index ef2e7d24..4d8988e5 100644
--- a/tests/shaders/fp-unpack-01.c
+++ b/tests/shaders/fp-unpack-01.c
@@ -281,7 +281,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
index 405ccdde..42a9c041 100644
--- a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
+++ b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
@@ -53,7 +53,7 @@ piglit_display(void)
 
 	pass &= piglit_probe_pixel_rgb(15, 15, green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions.c b/tests/shaders/glsl-arb-fragment-coord-conventions.c
index 0f9e71ed..a403996f 100644
--- a/tests/shaders/glsl-arb-fragment-coord-conventions.c
+++ b/tests/shaders/glsl-arb-fragment-coord-conventions.c
@@ -201,7 +201,7 @@ piglit_display(void)
       pass = piglit_probe_pixel_rgb(99, 99, color2) && pass;
    }
 
-   glutSwapBuffers();
+   piglit_present_results();
 
    return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c
index 8e8cc3e3..62b0f13c 100644
--- a/tests/shaders/glsl-bindattriblocation.c
+++ b/tests/shaders/glsl-bindattriblocation.c
@@ -116,7 +116,7 @@ piglit_display(void)
 
 	glDisableVertexAttribArray(attrib_loc);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/glsl-bug-22603.c b/tests/shaders/glsl-bug-22603.c
index 7d44fbd8..95f16db8 100644
--- a/tests/shaders/glsl-bug-22603.c
+++ b/tests/shaders/glsl-bug-22603.c
@@ -158,7 +158,7 @@ piglit_display(void)
 	/* check that rect2 where less than rect1 is rendered */
 	pass &= piglit_probe_pixel_rgb(450, 250, rect2_color_bottom_rect1);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-cos.c b/tests/shaders/glsl-cos.c
index c7370fb9..3390dced 100644
--- a/tests/shaders/glsl-cos.c
+++ b/tests/shaders/glsl-cos.c
@@ -104,7 +104,7 @@ enum piglit_result piglit_display(void)
     
     pass = test();
 
-    glutSwapBuffers();
+    piglit_present_results();
 
     return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-deriv-varyings.c b/tests/shaders/glsl-deriv-varyings.c
index d707fff0..7a8c81f0 100644
--- a/tests/shaders/glsl-deriv-varyings.c
+++ b/tests/shaders/glsl-deriv-varyings.c
@@ -237,7 +237,7 @@ piglit_display(void)
 	pass = pass && piglit_probe_pixel_rgb(205, 125, deriv);
 
 	glFinish();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-derivs.c b/tests/shaders/glsl-derivs.c
index 943af49a..76e926a4 100644
--- a/tests/shaders/glsl-derivs.c
+++ b/tests/shaders/glsl-derivs.c
@@ -236,7 +236,7 @@ piglit_display(void)
 	pass = pass && piglit_probe_pixel_rgb(205, 125, deriv);
 
 	glFinish();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-bug25902.c b/tests/shaders/glsl-fs-bug25902.c
index 9efc59cf..743e615c 100644
--- a/tests/shaders/glsl-fs-bug25902.c
+++ b/tests/shaders/glsl-fs-bug25902.c
@@ -62,7 +62,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgb(12, 17, args);
 	pass &= piglit_probe_pixel_rgb(17, 17, black);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-color-matrix.c b/tests/shaders/glsl-fs-color-matrix.c
index a63a3e24..d3982754 100644
--- a/tests/shaders/glsl-fs-color-matrix.c
+++ b/tests/shaders/glsl-fs-color-matrix.c
@@ -114,7 +114,7 @@ piglit_display(void)
 				      white)
 		&& pass;
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteTextures(1, &tex);
 
diff --git a/tests/shaders/glsl-fs-discard-02.c b/tests/shaders/glsl-fs-discard-02.c
index 0ae9a7fa..278b0f48 100644
--- a/tests/shaders/glsl-fs-discard-02.c
+++ b/tests/shaders/glsl-fs-discard-02.c
@@ -107,7 +107,7 @@ enum piglit_result piglit_display(void)
 
 	pass = test();
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c
index cd8b863f..862ae90e 100644
--- a/tests/shaders/glsl-fs-exp2.c
+++ b/tests/shaders/glsl-fs-exp2.c
@@ -58,7 +58,7 @@ piglit_display(void)
 
 	pass &= piglit_probe_pixel_rgb(15, 15, gray);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-flat-color.c b/tests/shaders/glsl-fs-flat-color.c
index 124ba121..1ad92857 100644
--- a/tests/shaders/glsl-fs-flat-color.c
+++ b/tests/shaders/glsl-fs-flat-color.c
@@ -86,7 +86,7 @@ piglit_display(void)
 		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/glsl-fs-fogcolor-statechange.c b/tests/shaders/glsl-fs-fogcolor-statechange.c
index 2895d4a5..d3374c2c 100644
--- a/tests/shaders/glsl-fs-fogcolor-statechange.c
+++ b/tests/shaders/glsl-fs-fogcolor-statechange.c
@@ -57,7 +57,7 @@ piglit_display(void)
 				       piglit_width / 2, piglit_height,
 				       blue);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c
index 0c90dfe5..bdde679b 100644
--- a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c
+++ b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c
@@ -105,7 +105,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c
index 4a5131f0..b00f23ac 100644
--- a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c
+++ b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c
@@ -127,7 +127,7 @@ piglit_display(void)
 		pass = piglit_probe_pixel_rgb(piglit_width/2, y, expected) & pass;
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-fragcoord.c b/tests/shaders/glsl-fs-fragcoord.c
index 928f2f08..3e06d566 100644
--- a/tests/shaders/glsl-fs-fragcoord.c
+++ b/tests/shaders/glsl-fs-fragcoord.c
@@ -64,7 +64,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-loop-nested.c b/tests/shaders/glsl-fs-loop-nested.c
index dc6deb19..e6a70c48 100644
--- a/tests/shaders/glsl-fs-loop-nested.c
+++ b/tests/shaders/glsl-fs-loop-nested.c
@@ -91,7 +91,7 @@ piglit_display(void)
 	}
 
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-loop.c b/tests/shaders/glsl-fs-loop.c
index 79d2390d..c86fa8ac 100644
--- a/tests/shaders/glsl-fs-loop.c
+++ b/tests/shaders/glsl-fs-loop.c
@@ -89,7 +89,7 @@ piglit_display(void)
 	}
 
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-mix-constant.c b/tests/shaders/glsl-fs-mix-constant.c
index 1b41d3ca..db10bbd4 100644
--- a/tests/shaders/glsl-fs-mix-constant.c
+++ b/tests/shaders/glsl-fs-mix-constant.c
@@ -53,7 +53,7 @@ piglit_display(void)
 
 	pass &= piglit_probe_pixel_rgba(15, 15, gray);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-mix.c b/tests/shaders/glsl-fs-mix.c
index 472db6e9..fb24b525 100644
--- a/tests/shaders/glsl-fs-mix.c
+++ b/tests/shaders/glsl-fs-mix.c
@@ -60,7 +60,7 @@ piglit_display(void)
 
 	pass &= piglit_probe_pixel_rgba(15, 15, gray);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c
index 00b34557..707475a7 100644
--- a/tests/shaders/glsl-fs-pointcoord.c
+++ b/tests/shaders/glsl-fs-pointcoord.c
@@ -76,7 +76,7 @@ piglit_display(void)
 	pass = pass && piglit_probe_pixel_rgb(0, point_size - 1, black);
 	pass = pass && piglit_probe_pixel_rgb(point_size - 1, point_size - 1, red);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-raytrace-bug27060.c b/tests/shaders/glsl-fs-raytrace-bug27060.c
index a40f4e55..ad7d801f 100644
--- a/tests/shaders/glsl-fs-raytrace-bug27060.c
+++ b/tests/shaders/glsl-fs-raytrace-bug27060.c
@@ -268,7 +268,7 @@ piglit_display(void)
     }
   }
 
-  glutSwapBuffers();
+  piglit_present_results();
 
   return ((float)passed_cnt > (1.0F-failing_pixel_percentage)
           *piglit_width*piglit_height)
diff --git a/tests/shaders/glsl-fs-sampler-numbering.c b/tests/shaders/glsl-fs-sampler-numbering.c
index 4f36e803..6eedf006 100644
--- a/tests/shaders/glsl-fs-sampler-numbering.c
+++ b/tests/shaders/glsl-fs-sampler-numbering.c
@@ -62,7 +62,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgb(x1, y2, white);
 	pass &= piglit_probe_pixel_rgb(x2, y2, black);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-shader-stencil-export.c b/tests/shaders/glsl-fs-shader-stencil-export.c
index 94d8333b..7d2a66c4 100644
--- a/tests/shaders/glsl-fs-shader-stencil-export.c
+++ b/tests/shaders/glsl-fs-shader-stencil-export.c
@@ -53,7 +53,7 @@ piglit_display(void)
 	piglit_draw_rect(0, 0, piglit_width, piglit_height);
 
 	glReadPixels(0, 0, 3, 1, GL_STENCIL_INDEX, GL_FLOAT, p);
-	glutSwapBuffers();
+	piglit_present_results();
 
 	/* we hardcode 129 in the shader */
 	if (p[0] != 129)
diff --git a/tests/shaders/glsl-fs-sqrt-branch.c b/tests/shaders/glsl-fs-sqrt-branch.c
index e32c7e48..67ed2aa5 100644
--- a/tests/shaders/glsl-fs-sqrt-branch.c
+++ b/tests/shaders/glsl-fs-sqrt-branch.c
@@ -58,7 +58,7 @@ piglit_display(void)
 
 	pass &= piglit_probe_pixel_rgb(15, 15, result);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-texture2drect.c b/tests/shaders/glsl-fs-texture2drect.c
index 294388c2..94f571a7 100644
--- a/tests/shaders/glsl-fs-texture2drect.c
+++ b/tests/shaders/glsl-fs-texture2drect.c
@@ -121,7 +121,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-texturecube-2.c b/tests/shaders/glsl-fs-texturecube-2.c
index bdf88c4b..3b84f5c9 100644
--- a/tests/shaders/glsl-fs-texturecube-2.c
+++ b/tests/shaders/glsl-fs-texturecube-2.c
@@ -186,7 +186,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-texturecube.c b/tests/shaders/glsl-fs-texturecube.c
index 6c3bb389..cf0b7be5 100644
--- a/tests/shaders/glsl-fs-texturecube.c
+++ b/tests/shaders/glsl-fs-texturecube.c
@@ -149,7 +149,7 @@ piglit_display(void)
 
 	glDeleteTextures(1, &tex);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-textureenvcolor-statechange.c b/tests/shaders/glsl-fs-textureenvcolor-statechange.c
index 1a89805c..681d8ef5 100644
--- a/tests/shaders/glsl-fs-textureenvcolor-statechange.c
+++ b/tests/shaders/glsl-fs-textureenvcolor-statechange.c
@@ -57,7 +57,7 @@ piglit_display(void)
 				       piglit_width / 2, piglit_height,
 				       blue);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-fs-user-varying-ff.c b/tests/shaders/glsl-fs-user-varying-ff.c
index e1143ab3..bdb44194 100644
--- a/tests/shaders/glsl-fs-user-varying-ff.c
+++ b/tests/shaders/glsl-fs-user-varying-ff.c
@@ -63,7 +63,7 @@ piglit_display(void)
 		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/glsl-fwidth.c b/tests/shaders/glsl-fwidth.c
index 75ed26ca..ca36512b 100644
--- a/tests/shaders/glsl-fwidth.c
+++ b/tests/shaders/glsl-fwidth.c
@@ -234,7 +234,7 @@ piglit_display(void)
 	pass = pass && piglit_probe_pixel_rgb(205, 125, mostlyBlack);
 
 	glFinish();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c
index 63ac3549..4860cf1d 100644
--- a/tests/shaders/glsl-getattriblocation.c
+++ b/tests/shaders/glsl-getattriblocation.c
@@ -106,7 +106,7 @@ piglit_display(void)
 
 	glDisableVertexAttribArray(attrib_loc);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/glsl-kwin-blur-1.c b/tests/shaders/glsl-kwin-blur-1.c
index 32a6335b..36b92cfe 100644
--- a/tests/shaders/glsl-kwin-blur-1.c
+++ b/tests/shaders/glsl-kwin-blur-1.c
@@ -222,7 +222,7 @@ enum piglit_result piglit_display(void)
 
     pass = test();
 
-    glutSwapBuffers();
+    piglit_present_results();
 
     return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-kwin-blur-2.c b/tests/shaders/glsl-kwin-blur-2.c
index cbe3321d..042d7a98 100644
--- a/tests/shaders/glsl-kwin-blur-2.c
+++ b/tests/shaders/glsl-kwin-blur-2.c
@@ -251,7 +251,7 @@ enum piglit_result piglit_display(void)
 
     pass = test();
 
-    glutSwapBuffers();
+    piglit_present_results();
 
     return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-light-model.c b/tests/shaders/glsl-light-model.c
index 691f5bc7..82647830 100644
--- a/tests/shaders/glsl-light-model.c
+++ b/tests/shaders/glsl-light-model.c
@@ -100,7 +100,7 @@ piglit_display(void)
 
 	pass = pass && piglit_probe_pixel_rgb(15, 15, green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-link-empty-prog-02.c b/tests/shaders/glsl-link-empty-prog-02.c
index 4ec119db..0f7545cb 100644
--- a/tests/shaders/glsl-link-empty-prog-02.c
+++ b/tests/shaders/glsl-link-empty-prog-02.c
@@ -83,7 +83,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1,
 				       black);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-lod-bias.c b/tests/shaders/glsl-lod-bias.c
index f21327fc..28ff2082 100644
--- a/tests/shaders/glsl-lod-bias.c
+++ b/tests/shaders/glsl-lod-bias.c
@@ -201,7 +201,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-mat-attribute.c b/tests/shaders/glsl-mat-attribute.c
index 25fe1e55..6d306e38 100644
--- a/tests/shaders/glsl-mat-attribute.c
+++ b/tests/shaders/glsl-mat-attribute.c
@@ -181,7 +181,7 @@ enum piglit_result piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-max-varyings.c b/tests/shaders/glsl-max-varyings.c
index bfec0282..a0ad4337 100644
--- a/tests/shaders/glsl-max-varyings.c
+++ b/tests/shaders/glsl-max-varyings.c
@@ -249,7 +249,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	if (!pass)
 		return PIGLIT_FAIL;
diff --git a/tests/shaders/glsl-novertexdata.c b/tests/shaders/glsl-novertexdata.c
index f4f31981..a77b477c 100644
--- a/tests/shaders/glsl-novertexdata.c
+++ b/tests/shaders/glsl-novertexdata.c
@@ -94,7 +94,7 @@ piglit_display(void)
                                          expColor)
 		? PIGLIT_PASS : PIGLIT_FAIL;
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/glsl-orangebook-ch06-bump.c b/tests/shaders/glsl-orangebook-ch06-bump.c
index 59d513e2..8a864018 100644
--- a/tests/shaders/glsl-orangebook-ch06-bump.c
+++ b/tests/shaders/glsl-orangebook-ch06-bump.c
@@ -93,7 +93,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgb(bump_x - w / 16, bump_y - h / 16,
 				       test_bump_light);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-preprocessor-comments.c b/tests/shaders/glsl-preprocessor-comments.c
index 8fe34fb8..cfac79a0 100644
--- a/tests/shaders/glsl-preprocessor-comments.c
+++ b/tests/shaders/glsl-preprocessor-comments.c
@@ -58,7 +58,7 @@ piglit_display(void)
 
 	pass &= piglit_probe_pixel_rgb(15, 15, args1);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-routing.c b/tests/shaders/glsl-routing.c
index a04c6d39..8f3092f1 100644
--- a/tests/shaders/glsl-routing.c
+++ b/tests/shaders/glsl-routing.c
@@ -311,7 +311,7 @@ piglit_display(void)
         pass = test(conf[i][0], conf[i][1], i) && pass;
     }
 
-    glutSwapBuffers();
+    piglit_present_results();
 
     return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-sin.c b/tests/shaders/glsl-sin.c
index 1df03af6..24f71cb5 100644
--- a/tests/shaders/glsl-sin.c
+++ b/tests/shaders/glsl-sin.c
@@ -104,7 +104,7 @@ enum piglit_result piglit_display(void)
     
     pass = test();
 
-    glutSwapBuffers();
+    piglit_present_results();
 
     return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c
index 3a3ae229..b396b0f8 100644
--- a/tests/shaders/glsl-uniform-update.c
+++ b/tests/shaders/glsl-uniform-update.c
@@ -65,7 +65,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgb(30, 30, red);
 	pass &= piglit_probe_pixel_rgb(60, 30, blue);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c
index c629db25..73ac12ab 100644
--- a/tests/shaders/glsl-unused-varying.c
+++ b/tests/shaders/glsl-unused-varying.c
@@ -68,7 +68,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgb(15, 15, red);
 	pass &= piglit_probe_pixel_rgb(15, 35, green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-useprogram-displaylist.c b/tests/shaders/glsl-useprogram-displaylist.c
index 9d06b481..f535bc50 100644
--- a/tests/shaders/glsl-useprogram-displaylist.c
+++ b/tests/shaders/glsl-useprogram-displaylist.c
@@ -92,7 +92,7 @@ piglit_display(void)
 	pass = piglit_probe_pixel_rgb(piglit_width / 2, piglit_height / 2,
 				      green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-arrays.c b/tests/shaders/glsl-vs-arrays.c
index bf19dcaf..6241d949 100644
--- a/tests/shaders/glsl-vs-arrays.c
+++ b/tests/shaders/glsl-vs-arrays.c
@@ -55,7 +55,7 @@ piglit_display(void)
 
 	pass &= piglit_probe_pixel_rgb(15, 15, green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-functions.c b/tests/shaders/glsl-vs-functions.c
index c02ef541..f87ea364 100644
--- a/tests/shaders/glsl-vs-functions.c
+++ b/tests/shaders/glsl-vs-functions.c
@@ -56,7 +56,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgba(piglit_width / 2, piglit_height / 2,
 					result);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-if-bool.c b/tests/shaders/glsl-vs-if-bool.c
index dc1b2b11..ee2298d3 100644
--- a/tests/shaders/glsl-vs-if-bool.c
+++ b/tests/shaders/glsl-vs-if-bool.c
@@ -58,7 +58,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgb(15, 15, red);
 	pass &= piglit_probe_pixel_rgb(35, 15, green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-loop-nested.c b/tests/shaders/glsl-vs-loop-nested.c
index 6701a90b..83aad6c5 100644
--- a/tests/shaders/glsl-vs-loop-nested.c
+++ b/tests/shaders/glsl-vs-loop-nested.c
@@ -90,7 +90,7 @@ piglit_display(void)
 	}
 
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c
index 70db940c..2338104f 100644
--- a/tests/shaders/glsl-vs-loop.c
+++ b/tests/shaders/glsl-vs-loop.c
@@ -89,7 +89,7 @@ piglit_display(void)
 	}
 
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-mov-after-deref.c b/tests/shaders/glsl-vs-mov-after-deref.c
index 8cf8ef0a..6298eef2 100644
--- a/tests/shaders/glsl-vs-mov-after-deref.c
+++ b/tests/shaders/glsl-vs-mov-after-deref.c
@@ -55,7 +55,7 @@ piglit_display(void)
 
 	pass &= piglit_probe_pixel_rgb(15, 15, green);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-mvp-statechange.c b/tests/shaders/glsl-vs-mvp-statechange.c
index a2a299b8..9a852d87 100644
--- a/tests/shaders/glsl-vs-mvp-statechange.c
+++ b/tests/shaders/glsl-vs-mvp-statechange.c
@@ -59,7 +59,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/shaders/glsl-vs-normalscale.c b/tests/shaders/glsl-vs-normalscale.c
index 180f483b..add579a0 100644
--- a/tests/shaders/glsl-vs-normalscale.c
+++ b/tests/shaders/glsl-vs-normalscale.c
@@ -59,7 +59,7 @@ piglit_display(void)
 	pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height,
 				      gray);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-point-size.c b/tests/shaders/glsl-vs-point-size.c
index 7a020237..3ec341c6 100644
--- a/tests/shaders/glsl-vs-point-size.c
+++ b/tests/shaders/glsl-vs-point-size.c
@@ -76,7 +76,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1,
 				       black);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-raytrace-bug26691.c b/tests/shaders/glsl-vs-raytrace-bug26691.c
index 77c3a638..38aeb384 100644
--- a/tests/shaders/glsl-vs-raytrace-bug26691.c
+++ b/tests/shaders/glsl-vs-raytrace-bug26691.c
@@ -260,7 +260,7 @@ piglit_display(void)
     }
   }
 
-  glutSwapBuffers();
+  piglit_present_results();
 
   return ((float)passed_cnt > (1.0F-failing_pixel_percentage)
           *piglit_width*piglit_height)
diff --git a/tests/shaders/glsl-vs-statechange-1.c b/tests/shaders/glsl-vs-statechange-1.c
index 84733e41..d84a17f4 100644
--- a/tests/shaders/glsl-vs-statechange-1.c
+++ b/tests/shaders/glsl-vs-statechange-1.c
@@ -69,7 +69,7 @@ piglit_display(void)
 	pass &= piglit_probe_rect_rgba(piglit_width / 2, 0,
 				       piglit_width / 2, piglit_height, blue);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/glsl-vs-texturematrix-1.c b/tests/shaders/glsl-vs-texturematrix-1.c
index b1ed0cd5..37c3d7f5 100644
--- a/tests/shaders/glsl-vs-texturematrix-1.c
+++ b/tests/shaders/glsl-vs-texturematrix-1.c
@@ -72,7 +72,7 @@ piglit_display(void)
 				       piglit_height * 3 / 4,
 				       green) && pass;
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteTextures(1, &tex);
 
diff --git a/tests/shaders/glsl-vs-texturematrix-2.c b/tests/shaders/glsl-vs-texturematrix-2.c
index f0bfea90..b6190e0c 100644
--- a/tests/shaders/glsl-vs-texturematrix-2.c
+++ b/tests/shaders/glsl-vs-texturematrix-2.c
@@ -74,7 +74,7 @@ piglit_display(void)
 				       piglit_height * 3 / 4,
 				       green) && pass;
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	glDeleteTextures(1, &tex);
 
diff --git a/tests/shaders/glsl-vs-user-varying-ff.c b/tests/shaders/glsl-vs-user-varying-ff.c
index 3d91f9d9..14a5424d 100644
--- a/tests/shaders/glsl-vs-user-varying-ff.c
+++ b/tests/shaders/glsl-vs-user-varying-ff.c
@@ -61,7 +61,7 @@ piglit_display(void)
 		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/sso-simple.c b/tests/shaders/sso-simple.c
index daa92891..51a17300 100644
--- a/tests/shaders/sso-simple.c
+++ b/tests/shaders/sso-simple.c
@@ -97,7 +97,7 @@ piglit_display(void)
 		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/sso-uniforms-01.c b/tests/shaders/sso-uniforms-01.c
index 777c0d18..ee753e99 100644
--- a/tests/shaders/sso-uniforms-01.c
+++ b/tests/shaders/sso-uniforms-01.c
@@ -71,7 +71,7 @@ piglit_display(void)
 		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/sso-uniforms-02.c b/tests/shaders/sso-uniforms-02.c
index 3f05d830..92ce0966 100644
--- a/tests/shaders/sso-uniforms-02.c
+++ b/tests/shaders/sso-uniforms-02.c
@@ -70,7 +70,7 @@ piglit_display(void)
 		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/sso-user-varying-01.c b/tests/shaders/sso-user-varying-01.c
index 1fcbaea9..2cd1695a 100644
--- a/tests/shaders/sso-user-varying-01.c
+++ b/tests/shaders/sso-user-varying-01.c
@@ -74,7 +74,7 @@ piglit_display(void)
 		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/sso-user-varying-02.c b/tests/shaders/sso-user-varying-02.c
index af01e454..dacd14a9 100644
--- a/tests/shaders/sso-user-varying-02.c
+++ b/tests/shaders/sso-user-varying-02.c
@@ -74,7 +74,7 @@ piglit_display(void)
 		result = PIGLIT_FAIL;
 
 	if (!piglit_automatic)
-		glutSwapBuffers();
+		piglit_present_results();
 
 	return result;
 }
diff --git a/tests/shaders/trinity-fp1.c b/tests/shaders/trinity-fp1.c
index b52aa1f5..52fb4bbd 100644
--- a/tests/shaders/trinity-fp1.c
+++ b/tests/shaders/trinity-fp1.c
@@ -138,7 +138,7 @@ piglit_display(void)
 
 	DoFrame();
 	succ = DoTest();
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return succ ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/useprogram-flushverts-1.c b/tests/shaders/useprogram-flushverts-1.c
index 8410894c..16b79415 100644
--- a/tests/shaders/useprogram-flushverts-1.c
+++ b/tests/shaders/useprogram-flushverts-1.c
@@ -88,7 +88,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgba(piglit_width * 7 / 8, piglit_height / 2,
 					blue);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/useprogram-flushverts-2.c b/tests/shaders/useprogram-flushverts-2.c
index eca9ba77..ef88efe3 100644
--- a/tests/shaders/useprogram-flushverts-2.c
+++ b/tests/shaders/useprogram-flushverts-2.c
@@ -94,7 +94,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgba(piglit_width * 7 / 8, piglit_height / 2,
 					blue);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/useprogram-refcount-1.c b/tests/shaders/useprogram-refcount-1.c
index 8d6cef8e..d2f3e980 100644
--- a/tests/shaders/useprogram-refcount-1.c
+++ b/tests/shaders/useprogram-refcount-1.c
@@ -62,7 +62,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/shaders/useshaderprogram-flushverts-1.c b/tests/shaders/useshaderprogram-flushverts-1.c
index 95388869..61532ef8 100644
--- a/tests/shaders/useshaderprogram-flushverts-1.c
+++ b/tests/shaders/useshaderprogram-flushverts-1.c
@@ -90,7 +90,7 @@ piglit_display(void)
 	pass &= piglit_probe_pixel_rgba(piglit_width * 7 / 8, piglit_height / 2,
 					blue);
 
-	glutSwapBuffers();
+	piglit_present_results();
 
 	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
diff --git a/tests/shaders/vp-address-01.c b/tests/shaders/vp-address-01.c
index 7211b983..635ea327 100644
--- a/tests/shaders/vp-address-01.c
+++ b/tests/shaders/vp-address-01.c
@@ -104,7 +104,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-address-02.c b/tests/shaders/vp-address-02.c
index 98712c9c..12045c29 100644
--- a/tests/shaders/vp-address-02.c
+++ b/tests/shaders/vp-address-02.c
@@ -118,7 +118,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-address-03.c b/tests/shaders/vp-address-03.c
index 2606fa76..6e6f40b3 100644
--- a/tests/shaders/vp-address-03.c
+++ b/tests/shaders/vp-address-03.c
@@ -96,7 +96,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-address-04.c b/tests/shaders/vp-address-04.c
index b756bcfb..2296a9b6 100644
--- a/tests/shaders/vp-address-04.c
+++ b/tests/shaders/vp-address-04.c
@@ -175,7 +175,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-address-05.c b/tests/shaders/vp-address-05.c
index bdb0c898..5e90147c 100644
--- a/tests/shaders/vp-address-05.c
+++ b/tests/shaders/vp-address-05.c
@@ -99,7 +99,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-address-06.c b/tests/shaders/vp-address-06.c
index ef058bac..3e5fa673 100644
--- a/tests/shaders/vp-address-06.c
+++ b/tests/shaders/vp-address-06.c
@@ -98,7 +98,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-clipdistance-01.c b/tests/shaders/vp-clipdistance-01.c
index 46102403..8a36908b 100644
--- a/tests/shaders/vp-clipdistance-01.c
+++ b/tests/shaders/vp-clipdistance-01.c
@@ -111,7 +111,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-clipdistance-02.c b/tests/shaders/vp-clipdistance-02.c
index a911dda2..1d016d55 100644
--- a/tests/shaders/vp-clipdistance-02.c
+++ b/tests/shaders/vp-clipdistance-02.c
@@ -106,7 +106,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-clipdistance-03.c b/tests/shaders/vp-clipdistance-03.c
index 74e36ef8..ff11034e 100644
--- a/tests/shaders/vp-clipdistance-03.c
+++ b/tests/shaders/vp-clipdistance-03.c
@@ -91,7 +91,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-clipdistance-04.c b/tests/shaders/vp-clipdistance-04.c
index 5bca302e..793dc797 100644
--- a/tests/shaders/vp-clipdistance-04.c
+++ b/tests/shaders/vp-clipdistance-04.c
@@ -96,7 +96,7 @@ piglit_display(void)
 		}
 	}
 
-	glutSwapBuffers();
+	piglit_present_results();
 	return result;
 }
 
diff --git a/tests/shaders/vp-ignore-input.c b/tests/shaders/vp-ignore-input.c
index b5cc48f3..823308be 100644
--- a/tests/shaders/vp-ignore-input.c
+++ b/tests/shaders/vp-ignore-input.c
@@ -131,7 +131,7 @@ piglit_display(void)
 	glPopMatrix();
 
 	glFinish();
-        glutSwapBuffers();
+        piglit_present_results();
 
 	return PIGLIT_PASS;
 }