diff options
| author | Chris Forbes <chrisf@ijw.co.nz> | 2012-08-21 21:11:55 +1200 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-09-04 16:02:18 -0700 |
| commit | 9cad85663901e4c3f729b86b007a97fa1de13a5f (patch) | |
| tree | 72936357a09eb03955f59358f1517d217e6e7b97 | |
| parent | 9c6ac73c2871a3b08ea13d39cd5c596d75220aab (diff) | |
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>
308 files changed, 336 insertions, 336 deletions
diff --git a/tests/bugs/fdo22540.c b/tests/bugs/fdo22540.c index 3e5d5d519..2df694bce 100644 --- a/tests/bugs/fdo22540.c +++ b/tests/bugs/fdo22540.c @@ -88,7 +88,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(200, 150, gray); glFinish(); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/fdo23670-depth_test.c b/tests/bugs/fdo23670-depth_test.c index 85a1f9906..cf72240bd 100644 --- a/tests/bugs/fdo23670-depth_test.c +++ b/tests/bugs/fdo23670-depth_test.c @@ -78,7 +78,7 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(0, 0, red); pass &= piglit_probe_pixel_rgb(2, 0, white); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/fdo23670-drawpix_stencil.c b/tests/bugs/fdo23670-drawpix_stencil.c index c2498995c..ac13a00a8 100644 --- a/tests/bugs/fdo23670-drawpix_stencil.c +++ b/tests/bugs/fdo23670-drawpix_stencil.c @@ -74,7 +74,7 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(50, 50, 20, 10, red); pass &= piglit_probe_rect_rgb(50, 60, 20, 10, black); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c index fb0545e89..43a7042ef 100644 --- a/tests/bugs/fdo25614-genmipmap.c +++ b/tests/bugs/fdo25614-genmipmap.c @@ -151,7 +151,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c index 8e1069f71..2862b6380 100644 --- a/tests/bugs/point-sprite.c +++ b/tests/bugs/point-sprite.c @@ -140,7 +140,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/tex1d-2dborder.c b/tests/bugs/tex1d-2dborder.c index c93e2fe8c..4d04a9e52 100644 --- a/tests/bugs/tex1d-2dborder.c +++ b/tests/bugs/tex1d-2dborder.c @@ -98,7 +98,7 @@ piglit_display(void) pass &= test(GL_MIRROR_CLAMP_TO_BORDER_EXT, 3, 1); } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/tri-tex-crash.c b/tests/bugs/tri-tex-crash.c index 5f11587be..0b83541f1 100644 --- a/tests/bugs/tri-tex-crash.c +++ b/tests/bugs/tri-tex-crash.c @@ -104,7 +104,7 @@ piglit_display(void) else result = PIGLIT_FAIL; - glutSwapBuffers(); + piglit_present_results(); return result; } diff --git a/tests/bugs/vbo-buffer-unmap.c b/tests/bugs/vbo-buffer-unmap.c index c4e1f1df0..9be058555 100644 --- a/tests/bugs/vbo-buffer-unmap.c +++ b/tests/bugs/vbo-buffer-unmap.c @@ -76,7 +76,7 @@ piglit_display(void) glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA, GL_UNSIGNED_BYTE, image); - glutSwapBuffers(); + piglit_present_results(); return PIGLIT_PASS; } diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c index 74698b0c8..8b19ac321 100644 --- a/tests/fbo/fbo-1d.c +++ b/tests/fbo/fbo-1d.c @@ -137,7 +137,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-3d.c b/tests/fbo/fbo-3d.c index dcd030255..3fce49615 100644 --- a/tests/fbo/fbo-3d.c +++ b/tests/fbo/fbo-3d.c @@ -178,7 +178,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-alpha.c b/tests/fbo/fbo-alpha.c index 766ed7ad7..09a5d02b1 100644 --- a/tests/fbo/fbo-alpha.c +++ b/tests/fbo/fbo-alpha.c @@ -137,7 +137,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgba(piglit_width * 5 / 8, 0, gray) && pass; pass = piglit_probe_pixel_rgba(piglit_width * 7 / 8, 0, gray) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-alphatest-formats.c b/tests/fbo/fbo-alphatest-formats.c index 2ef271ec7..09b2277af 100644 --- a/tests/fbo/fbo-alphatest-formats.c +++ b/tests/fbo/fbo-alphatest-formats.c @@ -245,7 +245,7 @@ static enum piglit_result test_format(const struct format_desc *format) glDeleteFramebuffersEXT(1, &fb); if (!pass) { - glutSwapBuffers(); + piglit_present_results(); return PIGLIT_FAIL; } @@ -304,7 +304,7 @@ static enum piglit_result test_format(const struct format_desc *format) pass = GL_FALSE; } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-alphatest-nocolor-ff.c b/tests/fbo/fbo-alphatest-nocolor-ff.c index a0f66909a..5439d95d5 100644 --- a/tests/fbo/fbo-alphatest-nocolor-ff.c +++ b/tests/fbo/fbo-alphatest-nocolor-ff.c @@ -136,7 +136,7 @@ enum piglit_result piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-alphatest-nocolor.c b/tests/fbo/fbo-alphatest-nocolor.c index d0b4c1cd0..1794fd2a9 100644 --- a/tests/fbo/fbo-alphatest-nocolor.c +++ b/tests/fbo/fbo-alphatest-nocolor.c @@ -153,7 +153,7 @@ enum piglit_result piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-array.c b/tests/fbo/fbo-array.c index 2f75b9e03..962163957 100644 --- a/tests/fbo/fbo-array.c +++ b/tests/fbo/fbo-array.c @@ -205,7 +205,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-blending-formats.c b/tests/fbo/fbo-blending-formats.c index 9fb5bca21..8be09b01c 100644 --- a/tests/fbo/fbo-blending-formats.c +++ b/tests/fbo/fbo-blending-formats.c @@ -296,7 +296,7 @@ static enum piglit_result test_format(const struct format_desc *format) glDeleteFramebuffersEXT(1, &fb); if (!pass) { - glutSwapBuffers(); + piglit_present_results(); return PIGLIT_FAIL; } @@ -346,7 +346,7 @@ static enum piglit_result test_format(const struct format_desc *format) pass = GL_FALSE; } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-blit-d24s8.c b/tests/fbo/fbo-blit-d24s8.c index 81b8bc844..cb44990e4 100644 --- a/tests/fbo/fbo-blit-d24s8.c +++ b/tests/fbo/fbo-blit-d24s8.c @@ -250,7 +250,7 @@ run_test(void) glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); assert(glGetError() == 0); - glutSwapBuffers(); + piglit_present_results(); return pass; } diff --git a/tests/fbo/fbo-blit.c b/tests/fbo/fbo-blit.c index 519348887..7eb563704 100644 --- a/tests/fbo/fbo-blit.c +++ b/tests/fbo/fbo-blit.c @@ -196,7 +196,7 @@ run_test(void) pass = verify_color_rect(PAD, y1, SIZE, SIZE) && pass; glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - glutSwapBuffers(); + piglit_present_results(); return pass; } diff --git a/tests/fbo/fbo-clearmipmap.c b/tests/fbo/fbo-clearmipmap.c index f1ea0e859..a71af1ffb 100644 --- a/tests/fbo/fbo-clearmipmap.c +++ b/tests/fbo/fbo-clearmipmap.c @@ -165,7 +165,7 @@ piglit_display(void) x += dim + 1; } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-copypix.c b/tests/fbo/fbo-copypix.c index fcc420c49..7dc0e5954 100644 --- a/tests/fbo/fbo-copypix.c +++ b/tests/fbo/fbo-copypix.c @@ -193,7 +193,7 @@ run_test(void) pass = verify_color_rect(PAD, y1, SIZE, SIZE) && pass; pass = verify_color_rect(PAD, y2, SIZE, SIZE) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass; } diff --git a/tests/fbo/fbo-copyteximage-simple.c b/tests/fbo/fbo-copyteximage-simple.c index 8a9aea18a..6a9d3be90 100644 --- a/tests/fbo/fbo-copyteximage-simple.c +++ b/tests/fbo/fbo-copyteximage-simple.c @@ -135,7 +135,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-copyteximage.c b/tests/fbo/fbo-copyteximage.c index 604bea0d5..9a6be6f9f 100644 --- a/tests/fbo/fbo-copyteximage.c +++ b/tests/fbo/fbo-copyteximage.c @@ -138,7 +138,7 @@ piglit_display(void) glDeleteTextures(1, &tex); glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-cubemap.c b/tests/fbo/fbo-cubemap.c index b67e99668..cc91a149a 100644 --- a/tests/fbo/fbo-cubemap.c +++ b/tests/fbo/fbo-cubemap.c @@ -195,7 +195,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-depth-array.c b/tests/fbo/fbo-depth-array.c index 2b264b459..0143fe7cc 100644 --- a/tests/fbo/fbo-depth-array.c +++ b/tests/fbo/fbo-depth-array.c @@ -228,7 +228,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-depth-sample-compare.c b/tests/fbo/fbo-depth-sample-compare.c index 47aefb31c..aca8cbea5 100644 --- a/tests/fbo/fbo-depth-sample-compare.c +++ b/tests/fbo/fbo-depth-sample-compare.c @@ -485,7 +485,7 @@ piglit_display(void) result = count_and_report_bad_pixels(); - glutSwapBuffers(); + piglit_present_results(); return result; } diff --git a/tests/fbo/fbo-depth-tex1d.c b/tests/fbo/fbo-depth-tex1d.c index edd7a89b9..bc983b53d 100644 --- a/tests/fbo/fbo-depth-tex1d.c +++ b/tests/fbo/fbo-depth-tex1d.c @@ -194,7 +194,7 @@ enum piglit_result piglit_display(void) glDeleteTextures(1, &tex); glDeleteTextures(1, &ds); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-depth.c b/tests/fbo/fbo-depth.c index fdb61fb95..83080ffb7 100644 --- a/tests/fbo/fbo-depth.c +++ b/tests/fbo/fbo-depth.c @@ -302,7 +302,7 @@ enum piglit_result piglit_display(void) glDeleteFramebuffersEXT(1, &fb); glDeleteRenderbuffersEXT(1, &rb); - glutSwapBuffers(); + piglit_present_results(); assert(glGetError() == 0); return res; diff --git a/tests/fbo/fbo-depthstencil.c b/tests/fbo/fbo-depthstencil.c index 91a4da01d..b5317182f 100644 --- a/tests/fbo/fbo-depthstencil.c +++ b/tests/fbo/fbo-depthstencil.c @@ -471,7 +471,7 @@ enum piglit_result piglit_display(void) glDeleteRenderbuffersEXT(1, &rb); } - glutSwapBuffers(); + piglit_present_results(); assert(glGetError() == 0); return res; diff --git a/tests/fbo/fbo-depthtex.c b/tests/fbo/fbo-depthtex.c index a801ae7a1..d6a18e80f 100644 --- a/tests/fbo/fbo-depthtex.c +++ b/tests/fbo/fbo-depthtex.c @@ -146,7 +146,7 @@ enum piglit_result piglit_display(void) pass &= piglit_probe_pixel_rgb(expected[i].x, expected[i].y, expected[i].color); } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers-arbfp.c b/tests/fbo/fbo-drawbuffers-arbfp.c index b3266d8e6..a382b824e 100644 --- a/tests/fbo/fbo-drawbuffers-arbfp.c +++ b/tests/fbo/fbo-drawbuffers-arbfp.c @@ -132,7 +132,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/fbo/fbo-drawbuffers-blend-add.c b/tests/fbo/fbo-drawbuffers-blend-add.c index 3392f5b05..76bf32445 100644 --- a/tests/fbo/fbo-drawbuffers-blend-add.c +++ b/tests/fbo/fbo-drawbuffers-blend-add.c @@ -215,7 +215,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers-fragcolor.c b/tests/fbo/fbo-drawbuffers-fragcolor.c index 080c9764b..f93a43770 100644 --- a/tests/fbo/fbo-drawbuffers-fragcolor.c +++ b/tests/fbo/fbo-drawbuffers-fragcolor.c @@ -163,7 +163,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers-maxtargets.c b/tests/fbo/fbo-drawbuffers-maxtargets.c index d257f8bd2..e97009852 100644 --- a/tests/fbo/fbo-drawbuffers-maxtargets.c +++ b/tests/fbo/fbo-drawbuffers-maxtargets.c @@ -171,7 +171,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers.c b/tests/fbo/fbo-drawbuffers.c index 882be3530..4f63be5a4 100644 --- a/tests/fbo/fbo-drawbuffers.c +++ b/tests/fbo/fbo-drawbuffers.c @@ -118,7 +118,7 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgb(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers2-blend.c b/tests/fbo/fbo-drawbuffers2-blend.c index 74df808f6..fb9a5b67b 100644 --- a/tests/fbo/fbo-drawbuffers2-blend.c +++ b/tests/fbo/fbo-drawbuffers2-blend.c @@ -129,7 +129,7 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgb(piglit_width/2, 0, piglit_width/2, piglit_height, blue); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers2-colormask.c b/tests/fbo/fbo-drawbuffers2-colormask.c index 6de94454b..e7ca85163 100644 --- a/tests/fbo/fbo-drawbuffers2-colormask.c +++ b/tests/fbo/fbo-drawbuffers2-colormask.c @@ -127,7 +127,7 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgb(piglit_width/2, 0, piglit_width/2, piglit_height, blue); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-flushing-2.c b/tests/fbo/fbo-flushing-2.c index c84b2dab2..5250e7802 100644 --- a/tests/fbo/fbo-flushing-2.c +++ b/tests/fbo/fbo-flushing-2.c @@ -124,7 +124,7 @@ piglit_display(void) draw_green = !draw_green; } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-flushing.c b/tests/fbo/fbo-flushing.c index 898864ecd..7d37937a1 100644 --- a/tests/fbo/fbo-flushing.c +++ b/tests/fbo/fbo-flushing.c @@ -122,7 +122,7 @@ piglit_display(void) y += size + 5; } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c index 2a7671c6c..cfd7be2e6 100644 --- a/tests/fbo/fbo-fragcoord.c +++ b/tests/fbo/fbo-fragcoord.c @@ -131,7 +131,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c index ecde0382e..9277e5861 100644 --- a/tests/fbo/fbo-fragcoord2.c +++ b/tests/fbo/fbo-fragcoord2.c @@ -191,7 +191,7 @@ test(void) result = PIGLIT_FAIL; } - glutSwapBuffers(); + piglit_present_results(); return result; } diff --git a/tests/fbo/fbo-generatemipmap-array.c b/tests/fbo/fbo-generatemipmap-array.c index a4304e643..d3fa222b1 100644 --- a/tests/fbo/fbo-generatemipmap-array.c +++ b/tests/fbo/fbo-generatemipmap-array.c @@ -382,7 +382,7 @@ piglit_display(void) glDeleteTextures(1, &tex1d); glDeleteTextures(1, &tex2d); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-filtering.c b/tests/fbo/fbo-generatemipmap-filtering.c index 041284be8..b431d9b43 100644 --- a/tests/fbo/fbo-generatemipmap-filtering.c +++ b/tests/fbo/fbo-generatemipmap-filtering.c @@ -128,7 +128,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-formats.c b/tests/fbo/fbo-generatemipmap-formats.c index 4a7d58ea0..8ce942d5b 100644 --- a/tests/fbo/fbo-generatemipmap-formats.c +++ b/tests/fbo/fbo-generatemipmap-formats.c @@ -470,7 +470,7 @@ piglit_display(void) test_sets[test_index].basetype); } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-nonsquare.c b/tests/fbo/fbo-generatemipmap-nonsquare.c index 444bb2e12..99bc4823d 100644 --- a/tests/fbo/fbo-generatemipmap-nonsquare.c +++ b/tests/fbo/fbo-generatemipmap-nonsquare.c @@ -164,7 +164,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-npot.c b/tests/fbo/fbo-generatemipmap-npot.c index 73d9bf2f6..3d67b0afc 100644 --- a/tests/fbo/fbo-generatemipmap-npot.c +++ b/tests/fbo/fbo-generatemipmap-npot.c @@ -158,7 +158,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-scissor.c b/tests/fbo/fbo-generatemipmap-scissor.c index f5f3001a0..7dcb9c76e 100644 --- a/tests/fbo/fbo-generatemipmap-scissor.c +++ b/tests/fbo/fbo-generatemipmap-scissor.c @@ -164,7 +164,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-viewport.c b/tests/fbo/fbo-generatemipmap-viewport.c index cd8173d84..5dae037f4 100644 --- a/tests/fbo/fbo-generatemipmap-viewport.c +++ b/tests/fbo/fbo-generatemipmap-viewport.c @@ -154,7 +154,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap.c b/tests/fbo/fbo-generatemipmap.c index bad9afdc1..2d6709664 100644 --- a/tests/fbo/fbo-generatemipmap.c +++ b/tests/fbo/fbo-generatemipmap.c @@ -158,7 +158,7 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-integer.c b/tests/fbo/fbo-integer.c index 1e5599b19..c9e2c0f83 100644 --- a/tests/fbo/fbo-integer.c +++ b/tests/fbo/fbo-integer.c @@ -370,7 +370,7 @@ test_fbo(const struct format_info *info) } } - glutSwapBuffers(); + piglit_present_results(); glDeleteTextures(1, &texObj); glDeleteFramebuffers(1, &fbo); diff --git a/tests/fbo/fbo-luminance-alpha.c b/tests/fbo/fbo-luminance-alpha.c index b945e8993..62ef696bb 100644 --- a/tests/fbo/fbo-luminance-alpha.c +++ b/tests/fbo/fbo-luminance-alpha.c @@ -143,7 +143,7 @@ piglit_display(void) printf("Testing window result, blending SRC_ALPHA.\n"); pass = piglit_probe_pixel_rgba(piglit_width * 7 / 8, 0, win_blend2) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-maxsize.c b/tests/fbo/fbo-maxsize.c index ae4f6564c..ce973a1ad 100644 --- a/tests/fbo/fbo-maxsize.c +++ b/tests/fbo/fbo-maxsize.c @@ -216,7 +216,7 @@ piglit_display(void) glDeleteTextures(1, &tex); glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-nodepth-test.c b/tests/fbo/fbo-nodepth-test.c index a401ea53e..171874613 100644 --- a/tests/fbo/fbo-nodepth-test.c +++ b/tests/fbo/fbo-nodepth-test.c @@ -87,7 +87,7 @@ piglit_display(void) 0, 0, 1, 1); glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-nostencil-test.c b/tests/fbo/fbo-nostencil-test.c index 62dd7d962..43717495c 100644 --- a/tests/fbo/fbo-nostencil-test.c +++ b/tests/fbo/fbo-nostencil-test.c @@ -87,7 +87,7 @@ piglit_display(void) 0, 0, 1, 1); glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-pbo-readpixels-small.c b/tests/fbo/fbo-pbo-readpixels-small.c index b3fb6f43a..fc8a96064 100644 --- a/tests/fbo/fbo-pbo-readpixels-small.c +++ b/tests/fbo/fbo-pbo-readpixels-small.c @@ -156,7 +156,7 @@ piglit_display(void) glDeleteFramebuffersEXT(1, &fbo); glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-readdrawpix.c b/tests/fbo/fbo-readdrawpix.c index dc275767d..bc0c96fbe 100644 --- a/tests/fbo/fbo-readdrawpix.c +++ b/tests/fbo/fbo-readdrawpix.c @@ -196,7 +196,7 @@ run_test(void) pass = verify_color_rect(PAD, y1, SIZE, SIZE) && pass; pass = verify_color_rect(PAD, y2, SIZE, SIZE) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass; } diff --git a/tests/fbo/fbo-readpixels.c b/tests/fbo/fbo-readpixels.c index 36c4bc156..c6fcadc31 100644 --- a/tests/fbo/fbo-readpixels.c +++ b/tests/fbo/fbo-readpixels.c @@ -194,7 +194,7 @@ piglit_display(void) 0, (BUF_HEIGHT + 1) * 2); pass &= test_with_format(GL_RGB5_A1, GL_BGRA, 0, (BUF_HEIGHT + 1) * 3); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-rg.c b/tests/fbo/fbo-rg.c index 55850513d..b9cfc4db2 100644 --- a/tests/fbo/fbo-rg.c +++ b/tests/fbo/fbo-rg.c @@ -87,7 +87,7 @@ piglit_display(void) piglit_draw_rect_tex(0.0, -1.0, 1.0, 2.0, 0.0, 0.0, 1.0, 1.0); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-scissor-bitmap.c b/tests/fbo/fbo-scissor-bitmap.c index 458572ef3..58eb6f97e 100644 --- a/tests/fbo/fbo-scissor-bitmap.c +++ b/tests/fbo/fbo-scissor-bitmap.c @@ -342,7 +342,7 @@ static void display_texture_to_window(GLint texture) glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + piglit_present_results(); } enum piglit_result diff --git a/tests/fbo/fbo-srgb-blit.c b/tests/fbo/fbo-srgb-blit.c index 22f71158c..30ad4953e 100644 --- a/tests/fbo/fbo-srgb-blit.c +++ b/tests/fbo/fbo-srgb-blit.c @@ -114,7 +114,7 @@ enum piglit_result piglit_display(void) pass &= piglit_probe_pixel_rgb(expected[i].x, expected[i].y, expected[i].color); } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-srgb.c b/tests/fbo/fbo-srgb.c index 4f5682d2b..9a09c5c1d 100644 --- a/tests/fbo/fbo-srgb.c +++ b/tests/fbo/fbo-srgb.c @@ -161,7 +161,7 @@ framebuffer_srgb_fbo(int srgb_format) glDeleteFramebuffersEXT(1, &fbo); glDeleteTextures(1, &tex); - glutSwapBuffers(); + piglit_present_results(); return pass; } diff --git a/tests/fbo/fbo-stencil.c b/tests/fbo/fbo-stencil.c index cb91063d4..94497c62c 100644 --- a/tests/fbo/fbo-stencil.c +++ b/tests/fbo/fbo-stencil.c @@ -320,7 +320,7 @@ enum piglit_result piglit_display(void) glDeleteFramebuffersEXT(1, &fb); glDeleteRenderbuffersEXT(1, &rb); - glutSwapBuffers(); + piglit_present_results(); assert(glGetError() == 0); return res; diff --git a/tests/fbo/fbo-viewport.c b/tests/fbo/fbo-viewport.c index 8806dc080..0374c263c 100644 --- a/tests/fbo/fbo-viewport.c +++ b/tests/fbo/fbo-viewport.c @@ -169,7 +169,7 @@ piglit_display(void) printf("Showing %s image\n", (i & 1) ? "FBO" : "window"); glDrawPixels(piglit_width, piglit_height, GL_RGB, GL_UNSIGNED_BYTE, image); - glutSwapBuffers(); + piglit_present_results(); sleep(1); } } diff --git a/tests/general/array-stride.c b/tests/general/array-stride.c index 84e730dcd..297a55676 100644 --- a/tests/general/array-stride.c +++ b/tests/general/array-stride.c @@ -129,7 +129,7 @@ piglit_display(void) glReadPixels(0, 0, piglit_width, piglit_height, GL_RGBA, GL_UNSIGNED_BYTE, buf1); - glutSwapBuffers(); + piglit_present_results(); /* compare bufs */ if (memcmp(buf0, buf1, piglit_width * piglit_height * 4) != 0) { diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c index f7b65fb93..6e5fc1946 100644 --- a/tests/general/bgra-sec-color-pointer.c +++ b/tests/general/bgra-sec-color-pointer.c @@ -117,7 +117,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(275, 125, greyBlue); glFinish(); - glutSwapBuffers(); + piglit_present_results(); glDisable(GL_BLEND); glDisableClientState(GL_SECONDARY_COLOR_ARRAY); diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c index f9e52f905..f3703c3f2 100644 --- a/tests/general/bgra-vert-attrib-pointer.c +++ b/tests/general/bgra-vert-attrib-pointer.c @@ -187,7 +187,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(275, 125, greyBlue); glFinish(); - glutSwapBuffers(); + piglit_present_results(); glDisable(GL_BLEND); diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c index a02beb6d6..c4fc442fb 100644 --- a/tests/general/blendminmax.c +++ b/tests/general/blendminmax.c @@ -118,7 +118,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(15 + next_x * 3, piglit_height / 2, expected) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c index 8e23acf4e..98b645705 100644 --- a/tests/general/blendsquare.c +++ b/tests/general/blendsquare.c @@ -83,7 +83,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(15 + next_x * 3, piglit_height / 2, expected) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c index c6b8e7801..697cd3f0a 100644 --- a/tests/general/clear-varray-2.0.c +++ b/tests/general/clear-varray-2.0.c @@ -113,7 +113,7 @@ piglit_display(void) /* The second rectangle should have shown blue. */ pass = pass && piglit_probe_pixel_rgb(35, 15, blue); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/copypixels-draw-sync.c b/tests/general/copypixels-draw-sync.c index a75fd1649..9b3097541 100644 --- a/tests/general/copypixels-draw-sync.c +++ b/tests/general/copypixels-draw-sync.c @@ -63,7 +63,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/general/copypixels-sync.c b/tests/general/copypixels-sync.c index 9df1a4cd8..8feab9238 100644 --- a/tests/general/copypixels-sync.c +++ b/tests/general/copypixels-sync.c @@ -68,7 +68,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/depth-clamp-range.c b/tests/general/depth-clamp-range.c index cd9a0920b..a080e1466 100644 --- a/tests/general/depth-clamp-range.c +++ b/tests/general/depth-clamp-range.c @@ -127,7 +127,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(95, 15, white) && pass; pass = piglit_probe_pixel_rgb(95, 35, clear) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/depth_clamp.c b/tests/general/depth_clamp.c index bf80f942d..caa5e2b60 100644 --- a/tests/general/depth_clamp.c +++ b/tests/general/depth_clamp.c @@ -146,7 +146,7 @@ piglit_display(void) /* 8: clamped raster */ pass = piglit_probe_pixel_rgb(50, 90, white) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c index cbabf06cc..10ccac00c 100644 --- a/tests/general/depthfunc.c +++ b/tests/general/depthfunc.c @@ -121,7 +121,7 @@ piglit_display(void) i & 4 ? blue : green); } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/depthrange-clear.c b/tests/general/depthrange-clear.c index 95f5ff50c..45c92e1e4 100644 --- a/tests/general/depthrange-clear.c +++ b/tests/general/depthrange-clear.c @@ -127,7 +127,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/dlist-clear.c b/tests/general/dlist-clear.c index e07f2d1da..fd45141e9 100644 --- a/tests/general/dlist-clear.c +++ b/tests/general/dlist-clear.c @@ -89,7 +89,7 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, green); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c index 4a7cb9547..dabe7c314 100644 --- a/tests/general/dlist-fdo3129-01.c +++ b/tests/general/dlist-fdo3129-01.c @@ -75,7 +75,7 @@ piglit_display(void) result = PIGLIT_FAIL; } - glutSwapBuffers(); + piglit_present_results(); return result; } diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c index fece8269e..87752b236 100644 --- a/tests/general/dlist-fdo3129-02.c +++ b/tests/general/dlist-fdo3129-02.c @@ -74,7 +74,7 @@ piglit_display(void) result = PIGLIT_FAIL; } - glutSwapBuffers(); + piglit_present_results(); return result; } diff --git a/tests/general/dlist-fdo31590.c b/tests/general/dlist-fdo31590.c index 7629b22ef..536cf393e 100644 --- a/tests/general/dlist-fdo31590.c +++ b/tests/general/dlist-fdo31590.c @@ -122,7 +122,7 @@ piglit_display(void) return PIGLIT_FAIL; } - glutSwapBuffers(); + piglit_present_results(); return PIGLIT_PASS; } diff --git a/tests/general/draw-arrays-colormaterial.c b/tests/general/draw-arrays-colormaterial.c index 86355d60d..acca789aa 100644 --- a/tests/general/draw-arrays-colormaterial.c +++ b/tests/general/draw-arrays-colormaterial.c @@ -111,7 +111,7 @@ piglit_display(void) pass = GL_FALSE; } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c index 87a097b60..c21b8b7b9 100644 --- a/tests/general/draw-batch.c +++ b/tests/general/draw-batch.c @@ -198,6 +198,6 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(55, 105, c1); pass = pass && piglit_probe_pixel_rgb(75, 105, c2); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-copypixels-sync.c b/tests/general/draw-copypixels-sync.c index d102a7610..b7329a33c 100644 --- a/tests/general/draw-copypixels-sync.c +++ b/tests/general/draw-copypixels-sync.c @@ -63,7 +63,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/general/draw-elements-base-vertex-bounds.c b/tests/general/draw-elements-base-vertex-bounds.c index ba7e6805a..09ca577c8 100644 --- a/tests/general/draw-elements-base-vertex-bounds.c +++ b/tests/general/draw-elements-base-vertex-bounds.c @@ -116,7 +116,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1, test_colors[2]) && pass; pass = piglit_probe_pixel_rgb(0, piglit_height - 1, test_colors[3]) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c index bea22379e..6e7b260ba 100644 --- a/tests/general/draw-elements-base-vertex-neg.c +++ b/tests/general/draw-elements-base-vertex-neg.c @@ -133,7 +133,7 @@ enum piglit_result piglit_display(void) } glFinish(); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-elements-base-vertex.c b/tests/general/draw-elements-base-vertex.c index 4695d08a5..3b4e7328c 100644 --- a/tests/general/draw-elements-base-vertex.c +++ b/tests/general/draw-elements-base-vertex.c @@ -145,7 +145,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c index 3a837e4d5..ff1162694 100644 --- a/tests/general/draw-elements-vs-inputs.c +++ b/tests/general/draw-elements-vs-inputs.c @@ -170,7 +170,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(x2, y, expected1) && pass; } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c index 089a8a4cf..b2bfbd5c0 100644 --- a/tests/general/draw-elements.c +++ b/tests/general/draw-elements.c @@ -253,7 +253,7 @@ enum piglit_result } glFinish(); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-instanced-divisor.c b/tests/general/draw-instanced-divisor.c index 3c37bb992..cac9fd710 100644 --- a/tests/general/draw-instanced-divisor.c +++ b/tests/general/draw-instanced-divisor.c @@ -125,7 +125,7 @@ test_instancing(GLuint divisor) TestName, i); fprintf(stderr, "%s: color instance divisor = %u\n", TestName, divisor); - glutSwapBuffers(); + piglit_present_results(); return GL_FALSE; } } @@ -134,7 +134,7 @@ test_instancing(GLuint divisor) glDisableClientState(GL_VERTEX_ARRAY); glDisableVertexAttribArray(ColorAttrib); - glutSwapBuffers(); + piglit_present_results(); return GL_TRUE; } diff --git a/tests/general/draw-instanced.c b/tests/general/draw-instanced.c index 6ddbaaa21..6a61f69b3 100644 --- a/tests/general/draw-instanced.c +++ b/tests/general/draw-instanced.c @@ -124,13 +124,13 @@ test_instancing(void) if (!piglit_probe_pixel_rgba(pos[0], pos[1], Colors[i])) { fprintf(stderr, "%s: instance %d failed to draw correctly\n", TestName, i); - glutSwapBuffers(); + piglit_present_results(); return GL_FALSE; } } } - glutSwapBuffers(); + piglit_present_results(); return GL_TRUE; } diff --git a/tests/general/draw-sync.c b/tests/general/draw-sync.c index 42d6306bf..262f505e7 100644 --- a/tests/general/draw-sync.c +++ b/tests/general/draw-sync.c @@ -57,7 +57,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c index 04b03ea5f..b81b19c27 100644 --- a/tests/general/draw-vertices-half-float.c +++ b/tests/general/draw-vertices-half-float.c @@ -205,7 +205,7 @@ piglit_display(void) } glFinish(); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c index 2f65c7875..03d602e24 100644 --- a/tests/general/draw-vertices.c +++ b/tests/general/draw-vertices.c @@ -574,7 +574,7 @@ piglit_display(void) } glFinish(); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/early-z.c b/tests/general/early-z.c index 028d3b9f9..036fe5281 100644 --- a/tests/general/early-z.c +++ b/tests/general/early-z.c @@ -118,12 +118,12 @@ test_early_depth(void) glGetIntegerv(GL_CURRENT_RASTER_POSITION, pos); if (!piglit_probe_pixel_rgba(pos[0], pos[1], color)) { - glutSwapBuffers(); + piglit_present_results(); return GL_FALSE; } } - glutSwapBuffers(); + piglit_present_results(); return GL_TRUE; } diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c index fcee94749..50fb0ed89 100644 --- a/tests/general/fog-modes.c +++ b/tests/general/fog-modes.c @@ -117,7 +117,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/fragment-center.c b/tests/general/fragment-center.c index 4d8c4947f..924439e57 100644 --- a/tests/general/fragment-center.c +++ b/tests/general/fragment-center.c @@ -83,7 +83,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/framebuffer-srgb.c b/tests/general/framebuffer-srgb.c index a47b0dd09..96984b2f4 100644 --- a/tests/general/framebuffer-srgb.c +++ b/tests/general/framebuffer-srgb.c @@ -192,7 +192,7 @@ framebuffer_srgb_non_fbo(void) if (!piglit_probe_rect_rgb(30, 30, 20, 20, expected_green)) pass = GL_FALSE; - glutSwapBuffers(); + piglit_present_results(); return pass; } @@ -327,7 +327,7 @@ framebuffer_srgb_fbo(void) glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); draw_fbo(0, 0); - glutSwapBuffers(); + piglit_present_results(); glDeleteFramebuffersEXT(1, &fbo); return pass; } diff --git a/tests/general/hiz.c b/tests/general/hiz.c index 584f83287..508433ebe 100644 --- a/tests/general/hiz.c +++ b/tests/general/hiz.c @@ -235,7 +235,7 @@ enum piglit_result piglit_display() GLboolean pass = GL_TRUE; pass = pass && test_less(); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/infinite-spot-light.c b/tests/general/infinite-spot-light.c index a08c5b96d..485c66cf1 100644 --- a/tests/general/infinite-spot-light.c +++ b/tests/general/infinite-spot-light.c @@ -66,7 +66,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgba(0, 0, expected); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/line-aa-width.c b/tests/general/line-aa-width.c index 4f780ac0b..8b47e10b4 100644 --- a/tests/general/line-aa-width.c +++ b/tests/general/line-aa-width.c @@ -195,7 +195,7 @@ piglit_display(void) } } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c index 55b792ccc..9a0707be5 100644 --- a/tests/general/linestipple.c +++ b/tests/general/linestipple.c @@ -187,7 +187,7 @@ static void test(void) } glPopMatrix(); - glutSwapBuffers(); + piglit_present_results(); } diff --git a/tests/general/longprim.c b/tests/general/longprim.c index e7c0e7ec8..fd45905c8 100644 --- a/tests/general/longprim.c +++ b/tests/general/longprim.c @@ -91,7 +91,7 @@ test_prims(void) printf("%s: %s %u vertices\n", TestName, primNames[prim], len); glClear(GL_COLOR_BUFFER_BIT); draw(primTypes[prim], len); - glutSwapBuffers(); + piglit_present_results(); } } } diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c index bc1cd1ad7..4cf3de93d 100644 --- a/tests/general/occlusion-query-discard.c +++ b/tests/general/occlusion-query-discard.c @@ -114,7 +114,7 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + piglit_present_results(); glDeleteQueries(1, &q); glUseProgram(0); diff --git a/tests/general/occlusion_query.c b/tests/general/occlusion_query.c index 11b466e7b..8f715b72f 100644 --- a/tests/general/occlusion_query.c +++ b/tests/general/occlusion_query.c @@ -144,7 +144,7 @@ piglit_display(void) test_pass = do_test(0.0f, 0); test_pass &= do_test(85.0f, 1); - glutSwapBuffers(); + piglit_present_results(); return test_pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/oes-read-format.c b/tests/general/oes-read-format.c index 9b5495eb9..b103d0b5c 100644 --- a/tests/general/oes-read-format.c +++ b/tests/general/oes-read-format.c @@ -56,7 +56,7 @@ piglit_display(void) pass = glGetError() == 0; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/pbo-drawpixels.c b/tests/general/pbo-drawpixels.c index 84588e046..a553203c0 100644 --- a/tests/general/pbo-drawpixels.c +++ b/tests/general/pbo-drawpixels.c @@ -77,7 +77,7 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(10, 11, blue); pass &= piglit_probe_pixel_rgb(11, 11, red); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/pbo-read-argb8888.c b/tests/general/pbo-read-argb8888.c index 9639c70cc..46e3521a0 100644 --- a/tests/general/pbo-read-argb8888.c +++ b/tests/general/pbo-read-argb8888.c @@ -77,7 +77,7 @@ piglit_display(void) glReadPixels(piglit_width - 10, 10, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, (void *)(uintptr_t)4); - glutSwapBuffers(); + piglit_present_results(); addr = glMapBufferARB(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY_ARB); diff --git a/tests/general/pbo-readpixels-small.c b/tests/general/pbo-readpixels-small.c index a4b008b93..1fa11537f 100644 --- a/tests/general/pbo-readpixels-small.c +++ b/tests/general/pbo-readpixels-small.c @@ -105,7 +105,7 @@ piglit_display(void) pass &= probe(1, 1, 0x000000ff, addr[1]); glUnmapBufferARB(GL_PIXEL_PACK_BUFFER); - glutSwapBuffers(); + piglit_present_results(); glDeleteBuffersARB(1, &pbo); diff --git a/tests/general/pbo-teximage-tiling-2.c b/tests/general/pbo-teximage-tiling-2.c index 0c37d8488..c9cc82b4e 100644 --- a/tests/general/pbo-teximage-tiling-2.c +++ b/tests/general/pbo-teximage-tiling-2.c @@ -96,7 +96,7 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(12, 18, blue); pass &= piglit_probe_pixel_rgb(18, 18, white); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/pbo-teximage-tiling.c b/tests/general/pbo-teximage-tiling.c index b43f47e70..f746f9423 100644 --- a/tests/general/pbo-teximage-tiling.c +++ b/tests/general/pbo-teximage-tiling.c @@ -96,7 +96,7 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(12, 18, blue); pass &= piglit_probe_pixel_rgb(18, 18, white); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/pbo-teximage.c b/tests/general/pbo-teximage.c index 7b2343ec8..f1134f520 100644 --- a/tests/general/pbo-teximage.c +++ b/tests/general/pbo-teximage.c @@ -88,7 +88,7 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(12, 18, blue); pass &= piglit_probe_pixel_rgb(18, 18, red); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/point-line-no-cull.c b/tests/general/point-line-no-cull.c index 6c5b5dc6c..a2ef6346d 100644 --- a/tests/general/point-line-no-cull.c +++ b/tests/general/point-line-no-cull.c @@ -426,7 +426,7 @@ piglit_display(void) pass = test_lines_no_pgonmode() && pass; pass = test_points_no_pgonmode() && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c index c0e6bfa39..81d8956fc 100644 --- a/tests/general/polygon-mode.c +++ b/tests/general/polygon-mode.c @@ -281,7 +281,7 @@ test_combo(GLenum frontMode, GLenum backMode) } } - glutSwapBuffers(); + piglit_present_results(); return pass; } diff --git a/tests/general/pos-array.c b/tests/general/pos-array.c index 291d5b36d..6c91fa8c3 100644 --- a/tests/general/pos-array.c +++ b/tests/general/pos-array.c @@ -92,7 +92,7 @@ test_fixedfunc_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + piglit_present_results(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("conventional vertex arrays\n"); @@ -122,7 +122,7 @@ test_fixedfunc_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + piglit_present_results(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("generic array [%u]\n", attrib); @@ -149,7 +149,7 @@ test_fixedfunc_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, black); - glutSwapBuffers(); + piglit_present_results(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("generic array [%u]\n", attrib); @@ -160,7 +160,7 @@ test_fixedfunc_arrays(void) glDisableClientState(GL_COLOR_ARRAY); } - glutSwapBuffers(); + piglit_present_results(); glDeleteBuffersARB(1, &buf); @@ -226,7 +226,7 @@ test_glsl_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + piglit_present_results(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("compiler-assigned attribute locations\n"); @@ -261,7 +261,7 @@ test_glsl_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + piglit_present_results(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("user-assigned attribute locations\n"); @@ -319,7 +319,7 @@ test_glsl_no_arrays(void) glPointSize(1.0); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + piglit_present_results(); if (!p) { printf("%s: failed when drawing with GLSL and no vertex arrays\n", TestName); @@ -412,7 +412,7 @@ test_arbvp_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + piglit_present_results(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("ARB VP and conventional vertex arrays\n"); @@ -443,7 +443,7 @@ test_arbvp_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + piglit_present_results(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("ARB VP and generic vertex array[%u]\n", attrib); @@ -474,7 +474,7 @@ test_arbvp_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + piglit_present_results(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("ARB VP and generic vertex array[%u]\n", attrib); diff --git a/tests/general/provoking-vertex.c b/tests/general/provoking-vertex.c index cdd362a9c..ea4cb5fd5 100644 --- a/tests/general/provoking-vertex.c +++ b/tests/general/provoking-vertex.c @@ -82,7 +82,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(225, 130, blue); glFinish(); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c index 01db475bd..31be1ddfb 100644 --- a/tests/general/scissor-bitmap.c +++ b/tests/general/scissor-bitmap.c @@ -291,7 +291,7 @@ piglit_display() pass = pass && verify_bitmap_contents(&probes, i); } - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-clear.c b/tests/general/scissor-clear.c index 4a6fcd41b..6a732b1e8 100644 --- a/tests/general/scissor-clear.c +++ b/tests/general/scissor-clear.c @@ -63,7 +63,7 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, green); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-copypixels.c b/tests/general/scissor-copypixels.c index e21b9d44e..590b8b125 100644 --- a/tests/general/scissor-copypixels.c +++ b/tests/general/scissor-copypixels.c @@ -103,7 +103,7 @@ piglit_display(void) pass &= check_red_box_surrounded_by_green(dst_x, 30, 0, 0); pass &= check_red_box_surrounded_by_green(dst_x, 50, dst_w, dst_h); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-depth-clear.c b/tests/general/scissor-depth-clear.c index dd8aa50b3..64b87f927 100644 --- a/tests/general/scissor-depth-clear.c +++ b/tests/general/scissor-depth-clear.c @@ -81,7 +81,7 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, green); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-many.c b/tests/general/scissor-many.c index 5162e02a7..31147a80d 100644 --- a/tests/general/scissor-many.c +++ b/tests/general/scissor-many.c @@ -61,7 +61,7 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-offscreen.c b/tests/general/scissor-offscreen.c index 63d0fbeb9..d3b97a823 100644 --- a/tests/general/scissor-offscreen.c +++ b/tests/general/scissor-offscreen.c @@ -70,7 +70,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1, window_color) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-stencil-clear.c b/tests/general/scissor-stencil-clear.c index 2ee6e3edd..a13f4e7cc 100644 --- a/tests/general/scissor-stencil-clear.c +++ b/tests/general/scissor-stencil-clear.c @@ -92,7 +92,7 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, green); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/stencil-drawpixels.c b/tests/general/stencil-drawpixels.c index beae4189c..d39f09c86 100644 --- a/tests/general/stencil-drawpixels.c +++ b/tests/general/stencil-drawpixels.c @@ -101,7 +101,7 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, red); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c index 240e5ac28..d68c55dfe 100644 --- a/tests/general/stencil-twoside.c +++ b/tests/general/stencil-twoside.c @@ -212,7 +212,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(w * 9.5, piglit_height / 2, expected); pass = piglit_probe_pixel_rgb(w * 11.5, piglit_height / 2, expected); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c index e9c3040bf..8f26f5d05 100644 --- a/tests/general/stencil-wrap.c +++ b/tests/general/stencil-wrap.c @@ -137,7 +137,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(w * 7.5, piglit_height / 2, expected); pass = piglit_probe_pixel_rgb(w * 9.5, piglit_height / 2, expected); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/texgen.c b/tests/general/texgen.c index 020657f77..48eee5237 100644 --- a/tests/general/texgen.c +++ b/tests/general/texgen.c @@ -89,7 +89,7 @@ static void test_sanity(void) probe_cell("test_sanity", x, y, TextureData[y][x]); } - glutSwapBuffers(); + piglit_present_results(); } static void do_test_texgen_eye(const char* testname) @@ -148,7 +148,7 @@ static void do_test_texgen_eye(const char* testname) probe_cell(testname, x, y, TextureData[y+1][x+1]); } - glutSwapBuffers(); + piglit_present_results(); } static void test_texgen_eye(void) diff --git a/tests/general/timer_query.c b/tests/general/timer_query.c index 726495289..6ae494e71 100644 --- a/tests/general/timer_query.c +++ b/tests/general/timer_query.c @@ -108,7 +108,7 @@ piglit_display(void) /*printf("nsecs = %d %ld\n", nsecs, (long int) nsecs64);*/ - glutSwapBuffers(); + piglit_present_results(); return PIGLIT_PASS; } diff --git a/tests/general/two-sided-lighting-separate-specular.c b/tests/general/two-sided-lighting-separate-specular.c index 3aa386191..f660dff80 100644 --- a/tests/general/two-sided-lighting-separate-specular.c +++ b/tests/general/two-sided-lighting-separate-specular.c @@ -98,7 +98,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(x0, y1, purple) && pass; pass = piglit_probe_pixel_rgb(x1, y1, yellow) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/two-sided-lighting.c b/tests/general/two-sided-lighting.c index 3c0673d34..130840089 100644 --- a/tests/general/two-sided-lighting.c +++ b/tests/general/two-sided-lighting.c @@ -95,7 +95,7 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(x0, y1, blue) && pass; pass = piglit_probe_pixel_rgb(x1, y1, green) && pass; - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c index b5d6266cc..553fdd9a5 100644 --- a/tests/general/user-clip.c +++ b/tests/general/user-clip.c @@ -64,7 +64,7 @@ piglit_display(void) result = PIGLIT_FAIL; } - glutSwapBuffers(); + piglit_present_results(); return result; } diff --git a/tests/general/varray-disabled.c b/tests/general/varray-disabled.c index 709c86ab7..02e16259b 100644 --- a/tests/general/varray-disabled.c +++ b/tests/general/varray-disabled.c @@ -125,7 +125,7 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(piglit_width * 5 / 6, piglit_height / 2, blue); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/vbo-bufferdata.c b/tests/general/vbo-bufferdata.c index 7d8bda154..9a8dbbcbf 100644 --- a/tests/general/vbo-bufferdata.c +++ b/tests/general/vbo-bufferdata.c @@ -86,7 +86,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(250, 150, white); pass = pass && piglit_probe_pixel_rgb(150, 150, white); - glutSwapBuffers(); + piglit_present_results(); glDisableClientState(GL_VERTEX_ARRAY); diff --git a/tests/general/vbo-map-remap.c b/tests/general/vbo-map-remap.c index 870a4f2fa..db48eda35 100644 --- a/tests/general/vbo-map-remap.c +++ b/tests/general/vbo-map-remap.c @@ -97,7 +97,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(250, 150, white); pass = pass && piglit_probe_pixel_rgb(150, 150, white); - glutSwapBuffers(); + piglit_present_results(); glDisableClientState(GL_VERTEX_ARRAY); diff --git a/tests/general/vbo-subdata-sync.c b/tests/general/vbo-subdata-sync.c index b8d3d0852..f9e1f47e0 100644 --- a/tests/general/vbo-subdata-sync.c +++ b/tests/general/vbo-subdata-sync.c @@ -89,7 +89,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(250, 150, white); pass = pass && piglit_probe_pixel_rgb(150, 150, white); - glutSwapBuffers(); + piglit_present_results(); glDisableClientState(GL_VERTEX_ARRAY); diff --git a/tests/general/vbo-subdata-zero.c b/tests/general/vbo-subdata-zero.c index e8149558f..e3af70ea0 100644 --- a/tests/general/vbo-subdata-zero.c +++ b/tests/general/vbo-subdata-zero.c @@ -98,7 +98,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(250, 150, white); pass = pass && piglit_probe_pixel_rgb(150, 150, white); - glutSwapBuffers(); + piglit_present_results(); glDisableClientState(GL_VERTEX_ARRAY); diff --git a/tests/general/vs-point_size-zero.c b/tests/general/vs-point_size-zero.c index c1f41754d..8fd596ef0 100644 --- a/tests/general/vs-point_size-zero.c +++ b/tests/general/vs-point_size-zero.c @@ -60,7 +60,7 @@ piglit_display(void) if (!pass) puts("Fail: nothing rendered."); - glutSwapBuffers(); + piglit_present_results(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/hiz/hiz-util.c b/tests/hiz/hiz-util.c index 22b198a59..6c6404e1c 100644 --- a/tests/hiz/hiz-util.c +++ b/tests/hiz/hiz-util.c @@ -258,7 +258,7 @@ hiz_run_test_depth_test_fbo(const struct hiz_fbo_options *fbo_options) glBlitFramebuffer(0, 0, piglit_width, piglit_height, 0, 0, piglit_width, piglit_height, GL_COLOR_BUFFER_BIT, GL_NEAREST); - glutSwapBuffers(); + piglit_present_results(); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo); } @@ -272,7 +272,7 @@ hiz_run_test_depth_test_window() { bool pass = hiz_run_test_depth_test_common(); if (!piglit_automatic) - glutSwapBuffers(); + piglit_present_results(); return pass; } @@ -362,7 +362,7 @@ hiz_run_test_depth_read_fbo(const struct hiz_fbo_options *fbo_options) glBlitFramebuffer(0, 0, piglit_width, piglit_height, 0, 0, piglit_width, piglit_height, GL_COLOR_BUFFER_BIT, GL_NEAREST); - glutSwapBuffers(); + piglit_present_results(); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo); } @@ -376,7 +376,7 @@ hiz_run_test_depth_read_window() { bool pass = hiz_run_test_depth_read_common(); if (!piglit_automatic) - glutSwapBuffers(); + piglit_present_results(); return pass; } @@ -469,7 +469,7 @@ hiz_run_test_stencil_test_fbo(const struct hiz_fbo_options *fbo_options) glBlitFramebuffer(0, 0, piglit_width, piglit_height, 0, 0, piglit_width, piglit_height, GL_COLOR_BUFFER_BIT, GL_NEAREST); - glutSwapBuffers(); + piglit_present_results(); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo); } @@ -483,7 +483,7 @@ hiz_run_test_stencil_test_window() { bool pass = hiz_run_test_stencil_test_common(); if (!piglit_automatic) - glutSwapBuffers(); + piglit_present_results(); return pass; } @@ -584,7 +584,7 @@ hiz_run_test_stencil_read_fbo(const struct hiz_fbo_options *fbo_options) glBlitFramebuffer(0, 0, piglit_width, piglit_height, 0, 0, piglit_width, piglit_height, GL_COLOR_BUFFER_BIT, GL_NEAREST); - glutSwapBuffers(); + piglit_present_results(); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo); } @@ -598,7 +598,7 @@ hiz_run_test_stencil_read_window() { bool pass = hiz_run_test_stencil_read_common(); if (!piglit_automatic) - glutSwapBuffers(); + piglit_present_results(); return pass; } @@ -708,7 +708,7 @@ hiz_run_test_depth_stencil_test_fbo(const struct hiz_fbo_options *fbo_options) glBlitFramebuffer(0, 0, piglit_width, piglit_height, 0, 0, piglit_width, piglit_height, GL_COLOR_BUFFER_BIT, GL_NEAREST); - glutSwapBuffers(); + piglit_present_results(); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo); } diff --git a/tests/shaders/attribute0.c b/tests/shaders/attribute0.c index d3bdf9c0c..e86432516 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 d8ee25510..8de36cd4d 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 83b9e91eb..a2c5095a1 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 ababf1489..8f0168341 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 d52927143..235154430 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 63779ffbe..db2ca74eb 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 a3cbd8918..3a135ba10 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 665f7d739..3605d23f2 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 117114a2a..06e93f31d 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 217e0ee5b..4cc502294 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 052d02e86..49ffcaa27 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 4c6449253..b61c8a312 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 a5280e9f9..72a0968cc 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 5b019b4a3..fff001f26 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 ef2e7d244..4d8988e57 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 405ccddeb..42a9c041b 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 0f9e71ed6..a403996f1 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 8e8cc3e3d..62b0f13c3 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 7d44fbd8b..95f16db87 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 c7370fb9f..3390dcedf 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 d707fff05..7a8c81f06 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 943af49a6..76e926a42 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 9efc59cf8..743e615c9 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 a63a3e249..d39827540 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 0ae9a7fae..278b0f48d 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 cd8b863fc..862ae90e9 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 124ba1210..1ad928576 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 2895d4a57..d3374c2c0 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 0c90dfe5a..bdde679b0 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 4a5131f08..b00f23ac9 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 928f2f084..3e06d5661 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 dc6deb19f..e6a70c489 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 79d2390db..c86fa8ac3 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 1b41d3ca3..db10bbd4b 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 472db6e9e..fb24b525c 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 00b34557a..707475a79 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 a40f4e555..ad7d801f0 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 4f36e803a..6eedf006d 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 94d8333b3..7d2a66c4b 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 e32c7e48c..67ed2aa57 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 294388c25..94f571a73 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 bdf88c4b9..3b84f5c9e 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 6c3bb3897..cf0b7be5e 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 1a89805ce..681d8ef5f 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 e1143ab3a..bdb441949 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 75ed26ca0..ca36512b6 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 63ac35495..4860cf1d2 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 32a6335b8..36b92cfe3 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 cbe3321d6..042d7a985 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 691f5bc74..82647830b 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 4ec119db1..0f7545cbf 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 f21327fcf..28ff20824 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 25fe1e550..6d306e38f 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 bfec02828..a0ad43374 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 f4f319819..a77b477c3 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 59d513e24..8a8640184 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 8fe34fb8a..cfac79a02 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 a04c6d390..8f3092f1e 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 1df03af6b..24f71cb57 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 3a3ae2293..b396b0f8d 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 c629db256..73ac12ab1 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 9d06b4811..f535bc50c 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 bf19dcaff..6241d9491 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 c02ef541c..f87ea3645 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 dc1b2b110..ee2298d33 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 6701a90ba..83aad6c52 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 70db940c0..2338104f9 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 8cf8ef0a4..6298eef2f 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 a2a299b8a..9a852d878 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 180f483b9..add579a0f 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 7a020237d..3ec341c64 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 77c3a638a..38aeb3840 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 84733e417..d84a17f42 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 b1ed0cd5e..37c3d7f50 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 f0bfea90d..b6190e0c6 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 3d91f9d93..14a5424df 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 daa928918..51a17300c 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 777c0d18a..ee753e99c 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 3f05d830d..92ce09660 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 1fcbaea9f..2cd1695a2 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 af01e4543..dacd14a95 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 b52aa1f5d..52fb4bbd8 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 8410894cf..16b794159 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 eca9ba771..ef88efe32 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 8d6cef8ef..d2f3e9809 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 95388869b..61532ef88 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 7211b983e..635ea3270 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 98712c9cc..12045c292 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 2606fa76c..6e6f40b31 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 b756bcfb5..2296a9b64 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 bdb0c8984..5e90147cf 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 ef058bacb..3e5fa673d 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 461024036..8a36908b0 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 a911dda2c..1d016d550 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 74e36ef80..ff11034e3 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 5bca302e0..793dc7973 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 b5cc48f38..823308be1 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; } 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; } diff --git a/tests/texturing/array-texture.c b/tests/texturing/array-texture.c index e175e396c..b5d216a47 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 be9316339..4bec7aa46 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 7d056905d..fe3d9b63c 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 deed08422..c9a91b610 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 2d0780b10..d44a0024d 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 9ee1302b1..c57c8c864 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 715b3ba3b..ba718b466 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 4258c0cd7..1e98e619c 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 5dc87fc8e..112037cba 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 aa13d3a6d..58a21b934 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 f035206a4..2b641de56 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 d4ed84f44..243b5e9b4 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 17002c9b6..2ac21c715 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 8f4101d8b..1fe74dc6c 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 e4b464e44..46afde5dc 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 f8bac547b..3d4500078 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 e91e2d4b9..310f7aa01 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 58b4e3a4b..567dfbd5c 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 80ffce86f..d69c9cfe2 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 a55f74d6a..0150e2e4e 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 ae8e719e5..18712d656 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 2e3e4d79e..38b0e24d7 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 72e1e5f0b..2d0974921 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 5583fe70d..01e2e97b2 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 8b508b83b..b575d8b73 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 c085a9d24..5c2d10040 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 a8b8e25ac..6d8616b18 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 ddce3f7a8..9e7421c60 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 e61a6af25..6668770b9 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 655dc73d8..1c2bf14a5 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 9fa6da925..0f8056872 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 452019c9f..626a46df5 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 f79b02750..859195588 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 72d8313b9..e990057a9 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 0c77d77ed..2be7dc1de 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 f41a95201..11e75d0fa 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 6879689dc..9c69b2764 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 a92ea92ae..f2ca3ece3 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 339bfaef5..5706c1e84 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 9fd597d65..91e0a2fad 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 84a5f9b8d..927a145e9 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); |