diff options
| author | Pauli Nieminen <pauli.nieminen@linux.intel.com> | 2012-05-25 13:13:13 +0300 |
|---|---|---|
| committer | Pauli Nieminen <pauli.nieminen@linux.intel.com> | 2012-05-25 15:27:40 +0300 |
| commit | 29d72b6b2a6678f104addf8050acbd95a8537a34 (patch) | |
| tree | 9fe1ef2cd56b6529c60501d062a6a106bd78cf56 | |
| parent | ab252bc98aced732666734eb7f0caf74bc6ccf1c (diff) | |
tests: Don't call glutSwapBuffers when in auto modeegl_and_gles_dispatch_v2
To allow screenshot capturing work easily after tests always omit swap
buffers after automatic test.
The changes was done with sed and quick verification that there wasn't
already existing check before glutSwapBuffers.
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
303 files changed, 646 insertions, 323 deletions
diff --git a/tests/bugs/fdo22540.c b/tests/bugs/fdo22540.c index 5ed7b01c..b1464890 100644 --- a/tests/bugs/fdo22540.c +++ b/tests/bugs/fdo22540.c @@ -86,7 +86,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(200, 150, gray); glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/fdo23670-depth_test.c b/tests/bugs/fdo23670-depth_test.c index 685d4992..fa29201e 100644 --- a/tests/bugs/fdo23670-depth_test.c +++ b/tests/bugs/fdo23670-depth_test.c @@ -77,7 +77,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(0, 0, red); pass &= piglit_probe_pixel_rgb(2, 0, white); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/fdo23670-drawpix_stencil.c b/tests/bugs/fdo23670-drawpix_stencil.c index ab16e4c5..d1627523 100644 --- a/tests/bugs/fdo23670-drawpix_stencil.c +++ b/tests/bugs/fdo23670-drawpix_stencil.c @@ -73,7 +73,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(50, 50, 20, 10, red); pass &= piglit_probe_rect_rgb(50, 60, 20, 10, black); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c index aaaa3f96..dff31445 100644 --- a/tests/bugs/fdo25614-genmipmap.c +++ b/tests/bugs/fdo25614-genmipmap.c @@ -150,7 +150,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c index 574b07dd..2577811d 100644 --- a/tests/bugs/point-sprite.c +++ b/tests/bugs/point-sprite.c @@ -139,7 +139,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/tex1d-2dborder.c b/tests/bugs/tex1d-2dborder.c index 881ab470..4381dd3c 100644 --- a/tests/bugs/tex1d-2dborder.c +++ b/tests/bugs/tex1d-2dborder.c @@ -96,7 +96,8 @@ piglit_display(void) pass &= test(GL_MIRROR_CLAMP_TO_BORDER_EXT, 3, 1); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/bugs/tri-tex-crash.c b/tests/bugs/tri-tex-crash.c index e36c447e..a0664cf0 100644 --- a/tests/bugs/tri-tex-crash.c +++ b/tests/bugs/tri-tex-crash.c @@ -104,7 +104,8 @@ piglit_display(void) else result = PIGLIT_FAIL; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/bugs/vbo-buffer-unmap.c b/tests/bugs/vbo-buffer-unmap.c index 021a75ee..ec815afc 100644 --- a/tests/bugs/vbo-buffer-unmap.c +++ b/tests/bugs/vbo-buffer-unmap.c @@ -76,7 +76,8 @@ piglit_display(void) glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 8, 8, 0, GL_RGBA, GL_UNSIGNED_BYTE, image); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return PIGLIT_PASS; } diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c index b998f0b4..e3ccab89 100644 --- a/tests/fbo/fbo-1d.c +++ b/tests/fbo/fbo-1d.c @@ -135,7 +135,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-3d.c b/tests/fbo/fbo-3d.c index 5cfa8820..85d55034 100644 --- a/tests/fbo/fbo-3d.c +++ b/tests/fbo/fbo-3d.c @@ -176,7 +176,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-alpha.c b/tests/fbo/fbo-alpha.c index 48da59ba..e6f2cb68 100644 --- a/tests/fbo/fbo-alpha.c +++ b/tests/fbo/fbo-alpha.c @@ -136,7 +136,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-alphatest-formats.c b/tests/fbo/fbo-alphatest-formats.c index 5d1ae8dd..052d1da6 100644 --- a/tests/fbo/fbo-alphatest-formats.c +++ b/tests/fbo/fbo-alphatest-formats.c @@ -245,7 +245,8 @@ static enum piglit_result test_format(const struct format_desc *format, GLenum b glDeleteFramebuffersEXT(1, &fb); if (!pass) { - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return PIGLIT_FAIL; } @@ -304,7 +305,8 @@ static enum piglit_result test_format(const struct format_desc *format, GLenum b pass = GL_FALSE; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 f44e8d8f..597daec3 100644 --- a/tests/fbo/fbo-alphatest-nocolor-ff.c +++ b/tests/fbo/fbo-alphatest-nocolor-ff.c @@ -134,7 +134,8 @@ enum piglit_result piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-alphatest-nocolor.c b/tests/fbo/fbo-alphatest-nocolor.c index 0bc37ee5..f4e656de 100644 --- a/tests/fbo/fbo-alphatest-nocolor.c +++ b/tests/fbo/fbo-alphatest-nocolor.c @@ -150,7 +150,8 @@ enum piglit_result piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-array.c b/tests/fbo/fbo-array.c index 2efce555..c36fc7df 100644 --- a/tests/fbo/fbo-array.c +++ b/tests/fbo/fbo-array.c @@ -203,7 +203,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-blending-formats.c b/tests/fbo/fbo-blending-formats.c index e6546fba..e95ae0da 100644 --- a/tests/fbo/fbo-blending-formats.c +++ b/tests/fbo/fbo-blending-formats.c @@ -296,7 +296,8 @@ static enum piglit_result test_format(const struct format_desc *format, GLenum b glDeleteFramebuffersEXT(1, &fb); if (!pass) { - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return PIGLIT_FAIL; } @@ -346,7 +347,8 @@ static enum piglit_result test_format(const struct format_desc *format, GLenum b pass = GL_FALSE; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-blit-d24s8.c b/tests/fbo/fbo-blit-d24s8.c index 91d75ddd..678d2fa0 100644 --- a/tests/fbo/fbo-blit-d24s8.c +++ b/tests/fbo/fbo-blit-d24s8.c @@ -248,7 +248,8 @@ run_test(void) glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); assert(glGetError() == 0); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } diff --git a/tests/fbo/fbo-blit.c b/tests/fbo/fbo-blit.c index c1b8b2a8..3155fd3c 100644 --- a/tests/fbo/fbo-blit.c +++ b/tests/fbo/fbo-blit.c @@ -194,7 +194,8 @@ run_test(void) pass = verify_color_rect(PAD, y1, SIZE, SIZE) && pass; glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } diff --git a/tests/fbo/fbo-clearmipmap.c b/tests/fbo/fbo-clearmipmap.c index 36a2b8d3..430bdaba 100644 --- a/tests/fbo/fbo-clearmipmap.c +++ b/tests/fbo/fbo-clearmipmap.c @@ -164,7 +164,8 @@ piglit_display(void) x += dim + 1; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-copypix.c b/tests/fbo/fbo-copypix.c index 2a96f0ba..c87307c4 100644 --- a/tests/fbo/fbo-copypix.c +++ b/tests/fbo/fbo-copypix.c @@ -191,7 +191,8 @@ run_test(void) pass = verify_color_rect(PAD, y1, SIZE, SIZE) && pass; pass = verify_color_rect(PAD, y2, SIZE, SIZE) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } diff --git a/tests/fbo/fbo-copyteximage-simple.c b/tests/fbo/fbo-copyteximage-simple.c index a22f2f9e..d7337e0f 100644 --- a/tests/fbo/fbo-copyteximage-simple.c +++ b/tests/fbo/fbo-copyteximage-simple.c @@ -133,7 +133,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-copyteximage.c b/tests/fbo/fbo-copyteximage.c index 876bb903..b1f778d5 100644 --- a/tests/fbo/fbo-copyteximage.c +++ b/tests/fbo/fbo-copyteximage.c @@ -136,7 +136,8 @@ piglit_display(void) glDeleteTextures(1, &tex); glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-cubemap.c b/tests/fbo/fbo-cubemap.c index 266a0cad..596baf46 100644 --- a/tests/fbo/fbo-cubemap.c +++ b/tests/fbo/fbo-cubemap.c @@ -193,7 +193,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-depth-array.c b/tests/fbo/fbo-depth-array.c index 0002b5ba..d2a783dc 100644 --- a/tests/fbo/fbo-depth-array.c +++ b/tests/fbo/fbo-depth-array.c @@ -226,7 +226,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 53827be8..154fcec8 100644 --- a/tests/fbo/fbo-depth-sample-compare.c +++ b/tests/fbo/fbo-depth-sample-compare.c @@ -485,7 +485,8 @@ piglit_display(void) result = count_and_report_bad_pixels(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/fbo/fbo-depth-tex1d.c b/tests/fbo/fbo-depth-tex1d.c index 9d32c62e..90323534 100644 --- a/tests/fbo/fbo-depth-tex1d.c +++ b/tests/fbo/fbo-depth-tex1d.c @@ -192,7 +192,8 @@ enum piglit_result piglit_display(void) glDeleteTextures(1, &tex); glDeleteTextures(1, &ds); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-depth.c b/tests/fbo/fbo-depth.c index 21c3ba05..aece29d6 100644 --- a/tests/fbo/fbo-depth.c +++ b/tests/fbo/fbo-depth.c @@ -299,7 +299,8 @@ enum piglit_result piglit_display(void) glDeleteFramebuffersEXT(1, &fb); glDeleteRenderbuffersEXT(1, &rb); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); assert(glGetError() == 0); return res; diff --git a/tests/fbo/fbo-depthstencil.c b/tests/fbo/fbo-depthstencil.c index 094e5ea4..7c429ea2 100644 --- a/tests/fbo/fbo-depthstencil.c +++ b/tests/fbo/fbo-depthstencil.c @@ -468,7 +468,8 @@ enum piglit_result piglit_display(void) glDeleteRenderbuffersEXT(1, &rb); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); assert(glGetError() == 0); return res; diff --git a/tests/fbo/fbo-depthtex.c b/tests/fbo/fbo-depthtex.c index c31223fc..6d8050bd 100644 --- a/tests/fbo/fbo-depthtex.c +++ b/tests/fbo/fbo-depthtex.c @@ -145,7 +145,8 @@ enum piglit_result piglit_display(void) pass &= piglit_probe_pixel_rgb(expected[i].x, expected[i].y, expected[i].color); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers-arbfp.c b/tests/fbo/fbo-drawbuffers-arbfp.c index 13086c88..825d5c82 100644 --- a/tests/fbo/fbo-drawbuffers-arbfp.c +++ b/tests/fbo/fbo-drawbuffers-arbfp.c @@ -131,7 +131,8 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgba(piglit_width / 2, 0, piglit_width / 2, piglit_height, result1); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 d41d9cd7..b0fb9c0b 100644 --- a/tests/fbo/fbo-drawbuffers-blend-add.c +++ b/tests/fbo/fbo-drawbuffers-blend-add.c @@ -214,7 +214,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers-fragcolor.c b/tests/fbo/fbo-drawbuffers-fragcolor.c index fdcaac32..649aaa21 100644 --- a/tests/fbo/fbo-drawbuffers-fragcolor.c +++ b/tests/fbo/fbo-drawbuffers-fragcolor.c @@ -162,7 +162,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers-maxtargets.c b/tests/fbo/fbo-drawbuffers-maxtargets.c index 9fbf9ac6..1c1e4765 100644 --- a/tests/fbo/fbo-drawbuffers-maxtargets.c +++ b/tests/fbo/fbo-drawbuffers-maxtargets.c @@ -170,7 +170,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers.c b/tests/fbo/fbo-drawbuffers.c index 61127e0b..dfe0d964 100644 --- a/tests/fbo/fbo-drawbuffers.c +++ b/tests/fbo/fbo-drawbuffers.c @@ -117,7 +117,8 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgb(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers2-blend.c b/tests/fbo/fbo-drawbuffers2-blend.c index c73591b5..835e564a 100644 --- a/tests/fbo/fbo-drawbuffers2-blend.c +++ b/tests/fbo/fbo-drawbuffers2-blend.c @@ -128,7 +128,8 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgb(piglit_width/2, 0, piglit_width/2, piglit_height, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-drawbuffers2-colormask.c b/tests/fbo/fbo-drawbuffers2-colormask.c index 4c38fd0b..74b062c7 100644 --- a/tests/fbo/fbo-drawbuffers2-colormask.c +++ b/tests/fbo/fbo-drawbuffers2-colormask.c @@ -126,7 +126,8 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgb(piglit_width/2, 0, piglit_width/2, piglit_height, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-flushing-2.c b/tests/fbo/fbo-flushing-2.c index cd430a25..254e4e04 100644 --- a/tests/fbo/fbo-flushing-2.c +++ b/tests/fbo/fbo-flushing-2.c @@ -123,7 +123,8 @@ piglit_display(void) draw_green = !draw_green; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-flushing.c b/tests/fbo/fbo-flushing.c index 3272c8fe..d1225f49 100644 --- a/tests/fbo/fbo-flushing.c +++ b/tests/fbo/fbo-flushing.c @@ -121,7 +121,8 @@ piglit_display(void) y += size + 5; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c index 60ffd5bd..a4058991 100644 --- a/tests/fbo/fbo-fragcoord.c +++ b/tests/fbo/fbo-fragcoord.c @@ -129,7 +129,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c index 3823b157..189c79ef 100644 --- a/tests/fbo/fbo-fragcoord2.c +++ b/tests/fbo/fbo-fragcoord2.c @@ -190,7 +190,8 @@ test(void) result = PIGLIT_FAIL; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/fbo/fbo-generatemipmap-array.c b/tests/fbo/fbo-generatemipmap-array.c index 876ec735..54b8d39f 100644 --- a/tests/fbo/fbo-generatemipmap-array.c +++ b/tests/fbo/fbo-generatemipmap-array.c @@ -380,7 +380,8 @@ piglit_display(void) glDeleteTextures(1, &tex1d); glDeleteTextures(1, &tex2d); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-filtering.c b/tests/fbo/fbo-generatemipmap-filtering.c index 9a492678..665df668 100644 --- a/tests/fbo/fbo-generatemipmap-filtering.c +++ b/tests/fbo/fbo-generatemipmap-filtering.c @@ -126,7 +126,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-formats.c b/tests/fbo/fbo-generatemipmap-formats.c index e1f0af09..4459267b 100644 --- a/tests/fbo/fbo-generatemipmap-formats.c +++ b/tests/fbo/fbo-generatemipmap-formats.c @@ -459,7 +459,8 @@ piglit_display(void) test_sets[test_index].base, test_sets[test_index].basetype); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-nonsquare.c b/tests/fbo/fbo-generatemipmap-nonsquare.c index 214c7fd4..70cf6a9a 100644 --- a/tests/fbo/fbo-generatemipmap-nonsquare.c +++ b/tests/fbo/fbo-generatemipmap-nonsquare.c @@ -162,7 +162,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-npot.c b/tests/fbo/fbo-generatemipmap-npot.c index b70b4768..3bce8934 100644 --- a/tests/fbo/fbo-generatemipmap-npot.c +++ b/tests/fbo/fbo-generatemipmap-npot.c @@ -156,7 +156,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-scissor.c b/tests/fbo/fbo-generatemipmap-scissor.c index 6e65b6dd..f107e203 100644 --- a/tests/fbo/fbo-generatemipmap-scissor.c +++ b/tests/fbo/fbo-generatemipmap-scissor.c @@ -162,7 +162,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-viewport.c b/tests/fbo/fbo-generatemipmap-viewport.c index 998aad36..3966cbec 100644 --- a/tests/fbo/fbo-generatemipmap-viewport.c +++ b/tests/fbo/fbo-generatemipmap-viewport.c @@ -152,7 +152,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap.c b/tests/fbo/fbo-generatemipmap.c index c5513e45..3c060011 100644 --- a/tests/fbo/fbo-generatemipmap.c +++ b/tests/fbo/fbo-generatemipmap.c @@ -156,7 +156,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-integer.c b/tests/fbo/fbo-integer.c index 0a25f08a..a5292418 100644 --- a/tests/fbo/fbo-integer.c +++ b/tests/fbo/fbo-integer.c @@ -368,7 +368,8 @@ test_fbo(const struct format_info *info) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteTextures(1, &texObj); glDeleteFramebuffers(1, &fbo); diff --git a/tests/fbo/fbo-luminance-alpha.c b/tests/fbo/fbo-luminance-alpha.c index b8a4766f..149366f0 100644 --- a/tests/fbo/fbo-luminance-alpha.c +++ b/tests/fbo/fbo-luminance-alpha.c @@ -142,7 +142,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-maxsize.c b/tests/fbo/fbo-maxsize.c index 0719030f..5d5198f5 100644 --- a/tests/fbo/fbo-maxsize.c +++ b/tests/fbo/fbo-maxsize.c @@ -217,7 +217,8 @@ piglit_display(void) glDeleteTextures(1, &tex); glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-nodepth-test.c b/tests/fbo/fbo-nodepth-test.c index d2d29253..56ccb273 100644 --- a/tests/fbo/fbo-nodepth-test.c +++ b/tests/fbo/fbo-nodepth-test.c @@ -86,7 +86,8 @@ piglit_display(void) 0, 0, 1, 1); glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-nostencil-test.c b/tests/fbo/fbo-nostencil-test.c index 46fc676e..ade45cfe 100644 --- a/tests/fbo/fbo-nostencil-test.c +++ b/tests/fbo/fbo-nostencil-test.c @@ -86,7 +86,8 @@ piglit_display(void) 0, 0, 1, 1); glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 1903bbad..cd2c4e99 100644 --- a/tests/fbo/fbo-pbo-readpixels-small.c +++ b/tests/fbo/fbo-pbo-readpixels-small.c @@ -154,7 +154,8 @@ piglit_display(void) glDeleteFramebuffersEXT(1, &fbo); glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-readdrawpix.c b/tests/fbo/fbo-readdrawpix.c index c17c8afb..29fc0fb0 100644 --- a/tests/fbo/fbo-readdrawpix.c +++ b/tests/fbo/fbo-readdrawpix.c @@ -194,7 +194,8 @@ run_test(void) pass = verify_color_rect(PAD, y1, SIZE, SIZE) && pass; pass = verify_color_rect(PAD, y2, SIZE, SIZE) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } diff --git a/tests/fbo/fbo-readpixels.c b/tests/fbo/fbo-readpixels.c index 212bc9e8..379ae7a8 100644 --- a/tests/fbo/fbo-readpixels.c +++ b/tests/fbo/fbo-readpixels.c @@ -192,7 +192,8 @@ piglit_display(void) 0, (BUF_HEIGHT + 1) * 2); pass &= test_with_format(GL_RGB5_A1, GL_BGRA, 0, (BUF_HEIGHT + 1) * 3); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-rg.c b/tests/fbo/fbo-rg.c index ec2a151a..603a0089 100644 --- a/tests/fbo/fbo-rg.c +++ b/tests/fbo/fbo-rg.c @@ -86,7 +86,8 @@ piglit_display(void) piglit_draw_rect_tex(0.0, -1.0, 1.0, 2.0, 0.0, 0.0, 1.0, 1.0); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-scissor-bitmap.c b/tests/fbo/fbo-scissor-bitmap.c index baf0e418..7c66483c 100644 --- a/tests/fbo/fbo-scissor-bitmap.c +++ b/tests/fbo/fbo-scissor-bitmap.c @@ -341,7 +341,8 @@ static void display_texture_to_window(GLint texture) glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } enum piglit_result diff --git a/tests/fbo/fbo-srgb-blit.c b/tests/fbo/fbo-srgb-blit.c index fc8d4e14..52b6e868 100644 --- a/tests/fbo/fbo-srgb-blit.c +++ b/tests/fbo/fbo-srgb-blit.c @@ -113,7 +113,8 @@ enum piglit_result piglit_display(void) pass &= piglit_probe_pixel_rgb(expected[i].x, expected[i].y, expected[i].color); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-srgb.c b/tests/fbo/fbo-srgb.c index 3b6607f4..100732d0 100644 --- a/tests/fbo/fbo-srgb.c +++ b/tests/fbo/fbo-srgb.c @@ -159,7 +159,8 @@ framebuffer_srgb_fbo(int srgb_format) glDeleteFramebuffersEXT(1, &fbo); glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } diff --git a/tests/fbo/fbo-stencil.c b/tests/fbo/fbo-stencil.c index 88b772a8..e89977d7 100644 --- a/tests/fbo/fbo-stencil.c +++ b/tests/fbo/fbo-stencil.c @@ -317,7 +317,8 @@ enum piglit_result piglit_display(void) glDeleteFramebuffersEXT(1, &fb); glDeleteRenderbuffersEXT(1, &rb); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); assert(glGetError() == 0); return res; diff --git a/tests/fbo/fbo-viewport.c b/tests/fbo/fbo-viewport.c index c665ad69..9f9dc91b 100644 --- a/tests/fbo/fbo-viewport.c +++ b/tests/fbo/fbo-viewport.c @@ -169,7 +169,8 @@ piglit_display(void) printf("Showing %s image\n", (i & 1) ? "FBO" : "window"); glDrawPixels(piglit_width, piglit_height, GL_RGB, GL_UNSIGNED_BYTE, image); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); sleep(1); } } diff --git a/tests/general/array-stride.c b/tests/general/array-stride.c index aa46caad..494a6fce 100644 --- a/tests/general/array-stride.c +++ b/tests/general/array-stride.c @@ -128,7 +128,8 @@ piglit_display(void) glReadPixels(0, 0, piglit_width, piglit_height, GL_RGBA, GL_UNSIGNED_BYTE, buf1); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); /* 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 e94f545d..4c9e7d8d 100644 --- a/tests/general/bgra-sec-color-pointer.c +++ b/tests/general/bgra-sec-color-pointer.c @@ -115,7 +115,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(275, 125, greyBlue); glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 7f0d53f2..f5e7f08f 100644 --- a/tests/general/bgra-vert-attrib-pointer.c +++ b/tests/general/bgra-vert-attrib-pointer.c @@ -185,7 +185,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(275, 125, greyBlue); glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDisable(GL_BLEND); diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c index 65213581..1d00a1dd 100644 --- a/tests/general/blendminmax.c +++ b/tests/general/blendminmax.c @@ -116,7 +116,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(15 + next_x * 3, piglit_height / 2, expected) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c index 8850a413..8aa6fa9c 100644 --- a/tests/general/blendsquare.c +++ b/tests/general/blendsquare.c @@ -81,7 +81,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(15 + next_x * 3, piglit_height / 2, expected) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 ac853e4a..b5975a6c 100644 --- a/tests/general/clear-varray-2.0.c +++ b/tests/general/clear-varray-2.0.c @@ -111,7 +111,8 @@ piglit_display(void) /* The second rectangle should have shown blue. */ pass = pass && piglit_probe_pixel_rgb(35, 15, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/copypixels-draw-sync.c b/tests/general/copypixels-draw-sync.c index 54ffc0e0..ec911f56 100644 --- a/tests/general/copypixels-draw-sync.c +++ b/tests/general/copypixels-draw-sync.c @@ -62,7 +62,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/copypixels-sync.c b/tests/general/copypixels-sync.c index 9a13628c..8333a843 100644 --- a/tests/general/copypixels-sync.c +++ b/tests/general/copypixels-sync.c @@ -67,7 +67,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/depth-clamp-range.c b/tests/general/depth-clamp-range.c index c93e7edb..2950fc1d 100644 --- a/tests/general/depth-clamp-range.c +++ b/tests/general/depth-clamp-range.c @@ -125,7 +125,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(95, 15, white) && pass; pass = piglit_probe_pixel_rgb(95, 35, clear) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/depth_clamp.c b/tests/general/depth_clamp.c index 645fff47..2b030fb2 100644 --- a/tests/general/depth_clamp.c +++ b/tests/general/depth_clamp.c @@ -144,7 +144,8 @@ piglit_display(void) /* 8: clamped raster */ pass = piglit_probe_pixel_rgb(50, 90, white) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c index 2591f745..82d36487 100644 --- a/tests/general/depthfunc.c +++ b/tests/general/depthfunc.c @@ -120,7 +120,8 @@ piglit_display(void) i & 4 ? blue : green); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/depthrange-clear.c b/tests/general/depthrange-clear.c index 0e895b75..cba93554 100644 --- a/tests/general/depthrange-clear.c +++ b/tests/general/depthrange-clear.c @@ -125,7 +125,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/dlist-clear.c b/tests/general/dlist-clear.c index 7efc5653..9bc0bdb5 100644 --- a/tests/general/dlist-clear.c +++ b/tests/general/dlist-clear.c @@ -87,7 +87,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c index b71eabef..a3ac568b 100644 --- a/tests/general/dlist-fdo3129-01.c +++ b/tests/general/dlist-fdo3129-01.c @@ -74,7 +74,8 @@ piglit_display(void) result = PIGLIT_FAIL; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c index 23c2e507..5fcdd388 100644 --- a/tests/general/dlist-fdo3129-02.c +++ b/tests/general/dlist-fdo3129-02.c @@ -73,7 +73,8 @@ piglit_display(void) result = PIGLIT_FAIL; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/general/dlist-fdo31590.c b/tests/general/dlist-fdo31590.c index 820b301f..7b664d97 100644 --- a/tests/general/dlist-fdo31590.c +++ b/tests/general/dlist-fdo31590.c @@ -121,7 +121,8 @@ piglit_display(void) return PIGLIT_FAIL; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return PIGLIT_PASS; } diff --git a/tests/general/draw-arrays-colormaterial.c b/tests/general/draw-arrays-colormaterial.c index a15f558e..e1190bc1 100644 --- a/tests/general/draw-arrays-colormaterial.c +++ b/tests/general/draw-arrays-colormaterial.c @@ -110,7 +110,8 @@ piglit_display(void) pass = GL_FALSE; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c index a9cc120e..e78f805f 100644 --- a/tests/general/draw-batch.c +++ b/tests/general/draw-batch.c @@ -196,6 +196,7 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(55, 105, c1); pass = pass && piglit_probe_pixel_rgb(75, 105, c2); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-copypixels-sync.c b/tests/general/draw-copypixels-sync.c index e0832fb8..31ba7178 100644 --- a/tests/general/draw-copypixels-sync.c +++ b/tests/general/draw-copypixels-sync.c @@ -62,7 +62,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 bdcdba76..d8d8a8a9 100644 --- a/tests/general/draw-elements-base-vertex-bounds.c +++ b/tests/general/draw-elements-base-vertex-bounds.c @@ -114,7 +114,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); 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 ce45d74d..588edff9 100644 --- a/tests/general/draw-elements-base-vertex-neg.c +++ b/tests/general/draw-elements-base-vertex-neg.c @@ -131,7 +131,8 @@ enum piglit_result piglit_display(void) } glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 f61d86e0..6d30e91f 100644 --- a/tests/general/draw-elements-base-vertex.c +++ b/tests/general/draw-elements-base-vertex.c @@ -143,7 +143,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 53e91c1b..7e7cd1fd 100644 --- a/tests/general/draw-elements-vs-inputs.c +++ b/tests/general/draw-elements-vs-inputs.c @@ -170,7 +170,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(x2, y, expected1) && pass; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c index ea3b926a..114c46b6 100644 --- a/tests/general/draw-elements.c +++ b/tests/general/draw-elements.c @@ -251,7 +251,8 @@ enum piglit_result } glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-instanced-divisor.c b/tests/general/draw-instanced-divisor.c index 19dda7cc..9dbf13fe 100644 --- a/tests/general/draw-instanced-divisor.c +++ b/tests/general/draw-instanced-divisor.c @@ -124,7 +124,8 @@ test_instancing(GLuint divisor) TestName, i); fprintf(stderr, "%s: color instance divisor = %u\n", TestName, divisor); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return GL_FALSE; } } @@ -133,7 +134,8 @@ test_instancing(GLuint divisor) glDisableClientState(GL_VERTEX_ARRAY); glDisableVertexAttribArray(ColorAttrib); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return GL_TRUE; } diff --git a/tests/general/draw-instanced.c b/tests/general/draw-instanced.c index 445108e7..01c009d0 100644 --- a/tests/general/draw-instanced.c +++ b/tests/general/draw-instanced.c @@ -123,13 +123,15 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); return GL_FALSE; } } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return GL_TRUE; } diff --git a/tests/general/draw-sync.c b/tests/general/draw-sync.c index 50804510..18320f5e 100644 --- a/tests/general/draw-sync.c +++ b/tests/general/draw-sync.c @@ -56,7 +56,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 3255658f..96395bf0 100644 --- a/tests/general/draw-vertices-half-float.c +++ b/tests/general/draw-vertices-half-float.c @@ -203,7 +203,8 @@ piglit_display(void) } glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c index 81408c2c..efda6ee5 100644 --- a/tests/general/draw-vertices.c +++ b/tests/general/draw-vertices.c @@ -572,7 +572,8 @@ piglit_display(void) } glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/early-z.c b/tests/general/early-z.c index a8eca342..9278282c 100644 --- a/tests/general/early-z.c +++ b/tests/general/early-z.c @@ -118,12 +118,14 @@ test_early_depth(void) glGetIntegerv(GL_CURRENT_RASTER_POSITION, pos); if (!piglit_probe_pixel_rgba(pos[0], pos[1], color)) { - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return GL_FALSE; } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return GL_TRUE; } diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c index c06790fd..cf5d54b7 100644 --- a/tests/general/fog-modes.c +++ b/tests/general/fog-modes.c @@ -116,7 +116,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/fragment-center.c b/tests/general/fragment-center.c index 631668d0..d746fdf4 100644 --- a/tests/general/fragment-center.c +++ b/tests/general/fragment-center.c @@ -81,7 +81,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/framebuffer-srgb.c b/tests/general/framebuffer-srgb.c index c741ac68..d7b2bda4 100644 --- a/tests/general/framebuffer-srgb.c +++ b/tests/general/framebuffer-srgb.c @@ -190,7 +190,8 @@ framebuffer_srgb_non_fbo(void) if (!piglit_probe_rect_rgb(30, 30, 20, 20, expected_green)) pass = GL_FALSE; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } @@ -325,7 +326,8 @@ framebuffer_srgb_fbo(void) glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); draw_fbo(0, 0); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteFramebuffersEXT(1, &fbo); return pass; } diff --git a/tests/general/hiz.c b/tests/general/hiz.c index 90211cbb..abfc9ce7 100644 --- a/tests/general/hiz.c +++ b/tests/general/hiz.c @@ -234,7 +234,8 @@ enum piglit_result piglit_display() GLboolean pass = GL_TRUE; pass = pass && test_less(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/infinite-spot-light.c b/tests/general/infinite-spot-light.c index bcae72dc..8ff5c870 100644 --- a/tests/general/infinite-spot-light.c +++ b/tests/general/infinite-spot-light.c @@ -64,7 +64,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgba(0, 0, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/line-aa-width.c b/tests/general/line-aa-width.c index 4cd560cf..953e69f3 100644 --- a/tests/general/line-aa-width.c +++ b/tests/general/line-aa-width.c @@ -193,7 +193,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c index f1e19edd..c0e43e2c 100644 --- a/tests/general/linestipple.c +++ b/tests/general/linestipple.c @@ -176,7 +176,8 @@ static void test(void) test_line(&Lines[i]); glPopMatrix(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } diff --git a/tests/general/longprim.c b/tests/general/longprim.c index 7a3ad68f..b22a4f26 100644 --- a/tests/general/longprim.c +++ b/tests/general/longprim.c @@ -90,7 +90,8 @@ test_prims(void) printf("%s: %s %u vertices\n", TestName, primNames[prim], len); glClear(GL_COLOR_BUFFER_BIT); draw(primTypes[prim], len); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } } } diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c index 88b039c4..3a2cffcd 100644 --- a/tests/general/occlusion-query-discard.c +++ b/tests/general/occlusion-query-discard.c @@ -112,7 +112,8 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteQueries(1, &q); glUseProgram(0); diff --git a/tests/general/occlusion_query.c b/tests/general/occlusion_query.c index ed39369d..e1d69d98 100644 --- a/tests/general/occlusion_query.c +++ b/tests/general/occlusion_query.c @@ -142,7 +142,8 @@ piglit_display(void) test_pass = do_test(0.0f, 0); test_pass &= do_test(85.0f, 1); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return test_pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/oes-read-format.c b/tests/general/oes-read-format.c index 4a76cbca..921c96da 100644 --- a/tests/general/oes-read-format.c +++ b/tests/general/oes-read-format.c @@ -54,7 +54,8 @@ piglit_display(void) pass = glGetError() == 0; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/pbo-drawpixels.c b/tests/general/pbo-drawpixels.c index e1a17ba7..4b6c57bf 100644 --- a/tests/general/pbo-drawpixels.c +++ b/tests/general/pbo-drawpixels.c @@ -75,7 +75,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(10, 11, blue); pass &= piglit_probe_pixel_rgb(11, 11, red); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/pbo-read-argb8888.c b/tests/general/pbo-read-argb8888.c index 487b6b13..6f4137a3 100644 --- a/tests/general/pbo-read-argb8888.c +++ b/tests/general/pbo-read-argb8888.c @@ -75,7 +75,8 @@ piglit_display(void) glReadPixels(piglit_width - 10, 10, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, (void *)(uintptr_t)4); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 0b9d43c4..9957660b 100644 --- a/tests/general/pbo-readpixels-small.c +++ b/tests/general/pbo-readpixels-small.c @@ -103,7 +103,8 @@ piglit_display(void) pass &= probe(1, 1, 0x000000ff, addr[1]); glUnmapBufferARB(GL_PIXEL_PACK_BUFFER); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteBuffersARB(1, &pbo); diff --git a/tests/general/pbo-teximage-tiling-2.c b/tests/general/pbo-teximage-tiling-2.c index 6677105f..d5d9820e 100644 --- a/tests/general/pbo-teximage-tiling-2.c +++ b/tests/general/pbo-teximage-tiling-2.c @@ -94,7 +94,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(12, 18, blue); pass &= piglit_probe_pixel_rgb(18, 18, white); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/pbo-teximage-tiling.c b/tests/general/pbo-teximage-tiling.c index 16c0dbaf..e34c7760 100644 --- a/tests/general/pbo-teximage-tiling.c +++ b/tests/general/pbo-teximage-tiling.c @@ -94,7 +94,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(12, 18, blue); pass &= piglit_probe_pixel_rgb(18, 18, white); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/pbo-teximage.c b/tests/general/pbo-teximage.c index 058d5191..d05773f0 100644 --- a/tests/general/pbo-teximage.c +++ b/tests/general/pbo-teximage.c @@ -86,7 +86,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(12, 18, blue); pass &= piglit_probe_pixel_rgb(18, 18, red); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 a411ad08..c8bafd65 100644 --- a/tests/general/point-line-no-cull.c +++ b/tests/general/point-line-no-cull.c @@ -426,7 +426,8 @@ piglit_display(void) pass = test_lines_no_pgonmode() && pass; pass = test_points_no_pgonmode() && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c index fdd95cc9..833b554b 100644 --- a/tests/general/polygon-mode.c +++ b/tests/general/polygon-mode.c @@ -280,7 +280,8 @@ test_combo(GLenum frontMode, GLenum backMode) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } diff --git a/tests/general/pos-array.c b/tests/general/pos-array.c index e4f0fe9d..99b3a4d8 100644 --- a/tests/general/pos-array.c +++ b/tests/general/pos-array.c @@ -90,7 +90,8 @@ test_fixedfunc_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("conventional vertex arrays\n"); @@ -120,7 +121,8 @@ test_fixedfunc_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("generic array [%u]\n", attrib); @@ -147,7 +149,8 @@ test_fixedfunc_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, black); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("generic array [%u]\n", attrib); @@ -158,7 +161,8 @@ test_fixedfunc_arrays(void) glDisableClientState(GL_COLOR_ARRAY); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteBuffersARB(1, &buf); @@ -224,7 +228,8 @@ test_glsl_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("compiler-assigned attribute locations\n"); @@ -259,7 +264,8 @@ test_glsl_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("user-assigned attribute locations\n"); @@ -317,7 +323,8 @@ test_glsl_no_arrays(void) glPointSize(1.0); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!p) { printf("%s: failed when drawing with GLSL and no vertex arrays\n", TestName); @@ -410,7 +417,8 @@ test_arbvp_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("ARB VP and conventional vertex arrays\n"); @@ -441,7 +449,8 @@ test_arbvp_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!p) { printf("%s: failed when drawing with ", TestName); printf("ARB VP and generic vertex array[%u]\n", attrib); @@ -472,7 +481,8 @@ test_arbvp_arrays(void) glDrawArrays(GL_QUADS, 0, 4); p = piglit_probe_pixel_rgba(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 d8d6d77b..04832d23 100644 --- a/tests/general/provoking-vertex.c +++ b/tests/general/provoking-vertex.c @@ -80,7 +80,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(225, 130, blue); glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/quad-invariance.c b/tests/general/quad-invariance.c index 06ef451c..49035102 100644 --- a/tests/general/quad-invariance.c +++ b/tests/general/quad-invariance.c @@ -100,7 +100,8 @@ piglit_display(void) once = GL_FALSE; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); for (x = 0; x < piglit_width / 2; x++) { for (y = 0; y < piglit_height; y++) { diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c index b3434129..d6000347 100644 --- a/tests/general/scissor-bitmap.c +++ b/tests/general/scissor-bitmap.c @@ -290,7 +290,8 @@ piglit_display() pass = pass && verify_bitmap_contents(&probes, i); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-clear.c b/tests/general/scissor-clear.c index 8fbf8f20..a2a444b7 100644 --- a/tests/general/scissor-clear.c +++ b/tests/general/scissor-clear.c @@ -61,7 +61,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-copypixels.c b/tests/general/scissor-copypixels.c index 9efc2e06..29b701f1 100644 --- a/tests/general/scissor-copypixels.c +++ b/tests/general/scissor-copypixels.c @@ -101,7 +101,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-depth-clear.c b/tests/general/scissor-depth-clear.c index b40b1c18..9f8e90d5 100644 --- a/tests/general/scissor-depth-clear.c +++ b/tests/general/scissor-depth-clear.c @@ -79,7 +79,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-many.c b/tests/general/scissor-many.c index f33e2fa0..ecac7706 100644 --- a/tests/general/scissor-many.c +++ b/tests/general/scissor-many.c @@ -59,7 +59,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-offscreen.c b/tests/general/scissor-offscreen.c index 9ea970ba..24b6ea75 100644 --- a/tests/general/scissor-offscreen.c +++ b/tests/general/scissor-offscreen.c @@ -69,7 +69,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1, window_color) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/scissor-stencil-clear.c b/tests/general/scissor-stencil-clear.c index 96587c61..641348a7 100644 --- a/tests/general/scissor-stencil-clear.c +++ b/tests/general/scissor-stencil-clear.c @@ -90,7 +90,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/stencil-drawpixels.c b/tests/general/stencil-drawpixels.c index a3df086b..72df08ae 100644 --- a/tests/general/stencil-drawpixels.c +++ b/tests/general/stencil-drawpixels.c @@ -99,7 +99,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(0, 20, piglit_width, piglit_height - 20, red); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c index 2d2d623f..e15ac8f8 100644 --- a/tests/general/stencil-twoside.c +++ b/tests/general/stencil-twoside.c @@ -209,7 +209,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c index cc7fbea3..2e45fd8d 100644 --- a/tests/general/stencil-wrap.c +++ b/tests/general/stencil-wrap.c @@ -136,7 +136,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/texgen.c b/tests/general/texgen.c index a05eaeaf..4d2fcdc7 100644 --- a/tests/general/texgen.c +++ b/tests/general/texgen.c @@ -88,7 +88,8 @@ static void test_sanity(void) probe_cell("test_sanity", x, y, TextureData[y][x]); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } static void do_test_texgen_eye(const char* testname) @@ -147,7 +148,8 @@ static void do_test_texgen_eye(const char* testname) probe_cell(testname, x, y, TextureData[y+1][x+1]); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } static void test_texgen_eye(void) diff --git a/tests/general/timer_query.c b/tests/general/timer_query.c index 3e9a29b3..15dae196 100644 --- a/tests/general/timer_query.c +++ b/tests/general/timer_query.c @@ -106,7 +106,8 @@ piglit_display(void) /*printf("nsecs = %d %ld\n", nsecs, (long int) nsecs64);*/ - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return PIGLIT_PASS; } diff --git a/tests/general/two-sided-lighting-separate-specular.c b/tests/general/two-sided-lighting-separate-specular.c index 45792df0..9da922da 100644 --- a/tests/general/two-sided-lighting-separate-specular.c +++ b/tests/general/two-sided-lighting-separate-specular.c @@ -97,7 +97,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(x0, y1, purple) && pass; pass = piglit_probe_pixel_rgb(x1, y1, yellow) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/two-sided-lighting.c b/tests/general/two-sided-lighting.c index 8820d3a8..616e809d 100644 --- a/tests/general/two-sided-lighting.c +++ b/tests/general/two-sided-lighting.c @@ -94,7 +94,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(x0, y1, blue) && pass; pass = piglit_probe_pixel_rgb(x1, y1, green) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c index ab95940d..a0414e32 100644 --- a/tests/general/user-clip.c +++ b/tests/general/user-clip.c @@ -67,7 +67,8 @@ piglit_display(void) result = PIGLIT_FAIL; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/general/varray-disabled.c b/tests/general/varray-disabled.c index cbd453d5..37b3b074 100644 --- a/tests/general/varray-disabled.c +++ b/tests/general/varray-disabled.c @@ -123,7 +123,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(piglit_width * 5 / 6, piglit_height / 2, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/general/vbo-bufferdata.c b/tests/general/vbo-bufferdata.c index a0469552..6d053a2f 100644 --- a/tests/general/vbo-bufferdata.c +++ b/tests/general/vbo-bufferdata.c @@ -84,7 +84,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(250, 150, white); pass = pass && piglit_probe_pixel_rgb(150, 150, white); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDisableClientState(GL_VERTEX_ARRAY); diff --git a/tests/general/vbo-map-remap.c b/tests/general/vbo-map-remap.c index 82ab06d6..310169e2 100644 --- a/tests/general/vbo-map-remap.c +++ b/tests/general/vbo-map-remap.c @@ -95,7 +95,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(250, 150, white); pass = pass && piglit_probe_pixel_rgb(150, 150, white); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDisableClientState(GL_VERTEX_ARRAY); diff --git a/tests/general/vbo-subdata-sync.c b/tests/general/vbo-subdata-sync.c index e4baef25..6db2c5f4 100644 --- a/tests/general/vbo-subdata-sync.c +++ b/tests/general/vbo-subdata-sync.c @@ -87,7 +87,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(250, 150, white); pass = pass && piglit_probe_pixel_rgb(150, 150, white); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDisableClientState(GL_VERTEX_ARRAY); diff --git a/tests/general/vbo-subdata-zero.c b/tests/general/vbo-subdata-zero.c index d0199fad..8f1ae976 100644 --- a/tests/general/vbo-subdata-zero.c +++ b/tests/general/vbo-subdata-zero.c @@ -96,7 +96,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(250, 150, white); pass = pass && piglit_probe_pixel_rgb(150, 150, white); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDisableClientState(GL_VERTEX_ARRAY); diff --git a/tests/general/vs-point_size-zero.c b/tests/general/vs-point_size-zero.c index f44b0bbd..115924c3 100644 --- a/tests/general/vs-point_size-zero.c +++ b/tests/general/vs-point_size-zero.c @@ -59,7 +59,8 @@ piglit_display(void) if (!pass) puts("Fail: nothing rendered."); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/mesa/tests/texline.c b/tests/mesa/tests/texline.c index 55fcc30c..3982f2fe 100644 --- a/tests/mesa/tests/texline.c +++ b/tests/mesa/tests/texline.c @@ -111,7 +111,8 @@ static void DoFrame(void) glPopMatrix(); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } static void Screenshot(void) diff --git a/tests/shaders/attribute0.c b/tests/shaders/attribute0.c index f3c8443d..2be87def 100644 --- a/tests/shaders/attribute0.c +++ b/tests/shaders/attribute0.c @@ -62,7 +62,8 @@ piglit_display(void) assert(!glGetError()); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/fp-abs-01.c b/tests/shaders/fp-abs-01.c index 6f87dc05..3d6316e5 100644 --- a/tests/shaders/fp-abs-01.c +++ b/tests/shaders/fp-abs-01.c @@ -140,7 +140,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/fp-abs-02.c b/tests/shaders/fp-abs-02.c index 16c3e126..291d88dc 100644 --- a/tests/shaders/fp-abs-02.c +++ b/tests/shaders/fp-abs-02.c @@ -162,7 +162,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/fp-condition_codes-01.c b/tests/shaders/fp-condition_codes-01.c index 34e28fb4..5ef81c8a 100644 --- a/tests/shaders/fp-condition_codes-01.c +++ b/tests/shaders/fp-condition_codes-01.c @@ -228,7 +228,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/fp-fog.c b/tests/shaders/fp-fog.c index 684d132e..59565255 100644 --- a/tests/shaders/fp-fog.c +++ b/tests/shaders/fp-fog.c @@ -105,7 +105,8 @@ piglit_display(void) expected_color); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/fp-formats.c b/tests/shaders/fp-formats.c index 1b7e1c2b..d714b930 100644 --- a/tests/shaders/fp-formats.c +++ b/tests/shaders/fp-formats.c @@ -68,7 +68,8 @@ piglit_display(void) expected)) result = PIGLIT_FAIL; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/fp-incomplete-tex.c b/tests/shaders/fp-incomplete-tex.c index 8dc284ea..203e24d2 100644 --- a/tests/shaders/fp-incomplete-tex.c +++ b/tests/shaders/fp-incomplete-tex.c @@ -177,7 +177,8 @@ piglit_display(void) DoFrame(); pass = DoTest(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/fp-kil.c b/tests/shaders/fp-kil.c index b32361d4..e1cf338c 100644 --- a/tests/shaders/fp-kil.c +++ b/tests/shaders/fp-kil.c @@ -251,7 +251,8 @@ piglit_display(void) DoFrame(); pass = DoTest(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/fp-lit-mask.c b/tests/shaders/fp-lit-mask.c index 224833a0..1dab9d46 100644 --- a/tests/shaders/fp-lit-mask.c +++ b/tests/shaders/fp-lit-mask.c @@ -112,7 +112,8 @@ piglit_display(void) DoFrame(); pass = DoTest(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 e59b3b32..a61156c2 100644 --- a/tests/shaders/fp-lit-src-equals-dst.c +++ b/tests/shaders/fp-lit-src-equals-dst.c @@ -106,7 +106,8 @@ piglit_display(void) DoFrame(); pass = DoTest(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/fp-rfl.c b/tests/shaders/fp-rfl.c index 8dd4c40c..b7ac1897 100644 --- a/tests/shaders/fp-rfl.c +++ b/tests/shaders/fp-rfl.c @@ -165,7 +165,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/fp-set-01.c b/tests/shaders/fp-set-01.c index 2a9a8f02..8300eace 100644 --- a/tests/shaders/fp-set-01.c +++ b/tests/shaders/fp-set-01.c @@ -125,7 +125,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/fp-set-02.c b/tests/shaders/fp-set-02.c index 682a6aba..3cd270fc 100644 --- a/tests/shaders/fp-set-02.c +++ b/tests/shaders/fp-set-02.c @@ -223,7 +223,8 @@ piglit_display(void) } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/fp-unpack-01.c b/tests/shaders/fp-unpack-01.c index 0b56e5ca..04d80693 100644 --- a/tests/shaders/fp-unpack-01.c +++ b/tests/shaders/fp-unpack-01.c @@ -280,7 +280,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 27470816..3a4fc47a 100644 --- a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c +++ b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c @@ -51,7 +51,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(15, 15, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 e6f81a5a..2ed212aa 100644 --- a/tests/shaders/glsl-arb-fragment-coord-conventions.c +++ b/tests/shaders/glsl-arb-fragment-coord-conventions.c @@ -199,7 +199,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(99, 99, color2) && pass; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c index aa389cee..d9b6cea6 100644 --- a/tests/shaders/glsl-bindattriblocation.c +++ b/tests/shaders/glsl-bindattriblocation.c @@ -115,7 +115,8 @@ piglit_display(void) glDisableVertexAttribArray(attrib_loc); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/glsl-bug-22603.c b/tests/shaders/glsl-bug-22603.c index 8f184013..34e7364c 100644 --- a/tests/shaders/glsl-bug-22603.c +++ b/tests/shaders/glsl-bug-22603.c @@ -156,7 +156,8 @@ piglit_display(void) /* check that rect2 where less than rect1 is rendered */ pass &= piglit_probe_pixel_rgb(450, 250, rect2_color_bottom_rect1); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-cos.c b/tests/shaders/glsl-cos.c index 6e3867f8..a09bd8c6 100644 --- a/tests/shaders/glsl-cos.c +++ b/tests/shaders/glsl-cos.c @@ -102,7 +102,8 @@ enum piglit_result piglit_display(void) pass = test(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-deriv-varyings.c b/tests/shaders/glsl-deriv-varyings.c index fe37326f..909149b5 100644 --- a/tests/shaders/glsl-deriv-varyings.c +++ b/tests/shaders/glsl-deriv-varyings.c @@ -235,7 +235,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(205, 125, deriv); glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-derivs.c b/tests/shaders/glsl-derivs.c index c2c155e5..76455ea6 100644 --- a/tests/shaders/glsl-derivs.c +++ b/tests/shaders/glsl-derivs.c @@ -234,7 +234,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(205, 125, deriv); glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-bug25902.c b/tests/shaders/glsl-fs-bug25902.c index 4d1bbf4a..83584003 100644 --- a/tests/shaders/glsl-fs-bug25902.c +++ b/tests/shaders/glsl-fs-bug25902.c @@ -60,7 +60,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(12, 17, args); pass &= piglit_probe_pixel_rgb(17, 17, black); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 6c70c758..b019529c 100644 --- a/tests/shaders/glsl-fs-color-matrix.c +++ b/tests/shaders/glsl-fs-color-matrix.c @@ -112,7 +112,8 @@ piglit_display(void) white) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteTextures(1, &tex); diff --git a/tests/shaders/glsl-fs-discard-02.c b/tests/shaders/glsl-fs-discard-02.c index 54b77aa0..fcf759d5 100644 --- a/tests/shaders/glsl-fs-discard-02.c +++ b/tests/shaders/glsl-fs-discard-02.c @@ -105,7 +105,8 @@ enum piglit_result piglit_display(void) pass = test(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c index 55d8bedc..67cd7eb7 100644 --- a/tests/shaders/glsl-fs-exp2.c +++ b/tests/shaders/glsl-fs-exp2.c @@ -56,7 +56,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(15, 15, gray); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-fogcolor-statechange.c b/tests/shaders/glsl-fs-fogcolor-statechange.c index c8650436..af5dec90 100644 --- a/tests/shaders/glsl-fs-fogcolor-statechange.c +++ b/tests/shaders/glsl-fs-fogcolor-statechange.c @@ -55,7 +55,8 @@ piglit_display(void) piglit_width / 2, piglit_height, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 7b15fb58..43b7356c 100644 --- a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c +++ b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c @@ -104,7 +104,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 352e9e9a..bf025939 100644 --- a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c +++ b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c @@ -125,7 +125,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(piglit_width/2, y, expected) & pass; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-fragcoord.c b/tests/shaders/glsl-fs-fragcoord.c index e00efc83..23e77de0 100644 --- a/tests/shaders/glsl-fs-fragcoord.c +++ b/tests/shaders/glsl-fs-fragcoord.c @@ -62,7 +62,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 d458ce72..963ce8a9 100644 --- a/tests/shaders/glsl-fs-loop-nested.c +++ b/tests/shaders/glsl-fs-loop-nested.c @@ -89,7 +89,8 @@ piglit_display(void) } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-loop.c b/tests/shaders/glsl-fs-loop.c index b7634d73..598be033 100644 --- a/tests/shaders/glsl-fs-loop.c +++ b/tests/shaders/glsl-fs-loop.c @@ -87,7 +87,8 @@ piglit_display(void) } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 e2482e4c..ca6791fa 100644 --- a/tests/shaders/glsl-fs-mix-constant.c +++ b/tests/shaders/glsl-fs-mix-constant.c @@ -51,7 +51,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgba(15, 15, gray); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-mix.c b/tests/shaders/glsl-fs-mix.c index ed77b38b..564b6735 100644 --- a/tests/shaders/glsl-fs-mix.c +++ b/tests/shaders/glsl-fs-mix.c @@ -58,7 +58,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgba(15, 15, gray); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c index 267c4e7b..8138365a 100644 --- a/tests/shaders/glsl-fs-pointcoord.c +++ b/tests/shaders/glsl-fs-pointcoord.c @@ -75,7 +75,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); 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 cfd87c84..18a84efa 100644 --- a/tests/shaders/glsl-fs-raytrace-bug27060.c +++ b/tests/shaders/glsl-fs-raytrace-bug27060.c @@ -266,7 +266,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 1fe89cd3..19688afc 100644 --- a/tests/shaders/glsl-fs-sampler-numbering.c +++ b/tests/shaders/glsl-fs-sampler-numbering.c @@ -60,7 +60,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(x1, y2, white); pass &= piglit_probe_pixel_rgb(x2, y2, black); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 10590ce8..fecc272d 100644 --- a/tests/shaders/glsl-fs-shader-stencil-export.c +++ b/tests/shaders/glsl-fs-shader-stencil-export.c @@ -51,7 +51,8 @@ piglit_display(void) piglit_draw_rect(0, 0, piglit_width, piglit_height); glReadPixels(0, 0, 3, 1, GL_STENCIL_INDEX, GL_FLOAT, p); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); /* 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 c289be40..2c697f93 100644 --- a/tests/shaders/glsl-fs-sqrt-branch.c +++ b/tests/shaders/glsl-fs-sqrt-branch.c @@ -56,7 +56,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(15, 15, result); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-sqrt-zero.c b/tests/shaders/glsl-fs-sqrt-zero.c index aa74e7a3..e35c3a60 100644 --- a/tests/shaders/glsl-fs-sqrt-zero.c +++ b/tests/shaders/glsl-fs-sqrt-zero.c @@ -50,7 +50,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(15, 15, color); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-texture2drect.c b/tests/shaders/glsl-fs-texture2drect.c index 7dadbf3a..5c1b7b8d 100644 --- a/tests/shaders/glsl-fs-texture2drect.c +++ b/tests/shaders/glsl-fs-texture2drect.c @@ -119,7 +119,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 b86c35a0..4b701c97 100644 --- a/tests/shaders/glsl-fs-texturecube-2.c +++ b/tests/shaders/glsl-fs-texturecube-2.c @@ -183,7 +183,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fs-texturecube.c b/tests/shaders/glsl-fs-texturecube.c index 6bc452a1..9d3bd2c7 100644 --- a/tests/shaders/glsl-fs-texturecube.c +++ b/tests/shaders/glsl-fs-texturecube.c @@ -147,7 +147,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 82281b09..446b791e 100644 --- a/tests/shaders/glsl-fs-textureenvcolor-statechange.c +++ b/tests/shaders/glsl-fs-textureenvcolor-statechange.c @@ -55,7 +55,8 @@ piglit_display(void) piglit_width / 2, piglit_height, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-fwidth.c b/tests/shaders/glsl-fwidth.c index 659d2140..fafcbaff 100644 --- a/tests/shaders/glsl-fwidth.c +++ b/tests/shaders/glsl-fwidth.c @@ -232,7 +232,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(205, 125, mostlyBlack); glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c index c5d554b5..ade31ae0 100644 --- a/tests/shaders/glsl-getattriblocation.c +++ b/tests/shaders/glsl-getattriblocation.c @@ -105,7 +105,8 @@ piglit_display(void) glDisableVertexAttribArray(attrib_loc); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/glsl-kwin-blur-1.c b/tests/shaders/glsl-kwin-blur-1.c index 8f489939..fe680d71 100644 --- a/tests/shaders/glsl-kwin-blur-1.c +++ b/tests/shaders/glsl-kwin-blur-1.c @@ -220,7 +220,8 @@ enum piglit_result piglit_display(void) pass = test(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 7c57e626..3e91775e 100644 --- a/tests/shaders/glsl-kwin-blur-2.c +++ b/tests/shaders/glsl-kwin-blur-2.c @@ -249,7 +249,8 @@ enum piglit_result piglit_display(void) pass = test(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-light-model.c b/tests/shaders/glsl-light-model.c index c785a3e7..7602551b 100644 --- a/tests/shaders/glsl-light-model.c +++ b/tests/shaders/glsl-light-model.c @@ -98,7 +98,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(15, 15, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 8ab04904..37f4adf6 100644 --- a/tests/shaders/glsl-link-empty-prog-02.c +++ b/tests/shaders/glsl-link-empty-prog-02.c @@ -80,7 +80,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1, black); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-lod-bias.c b/tests/shaders/glsl-lod-bias.c index 96dac05b..1858da79 100644 --- a/tests/shaders/glsl-lod-bias.c +++ b/tests/shaders/glsl-lod-bias.c @@ -200,7 +200,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-mat-attribute.c b/tests/shaders/glsl-mat-attribute.c index 07d5dbb9..eb45c0e4 100644 --- a/tests/shaders/glsl-mat-attribute.c +++ b/tests/shaders/glsl-mat-attribute.c @@ -179,7 +179,8 @@ enum piglit_result piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-max-varyings.c b/tests/shaders/glsl-max-varyings.c index 40b232f9..7ab67774 100644 --- a/tests/shaders/glsl-max-varyings.c +++ b/tests/shaders/glsl-max-varyings.c @@ -246,7 +246,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!pass) return PIGLIT_FAIL; diff --git a/tests/shaders/glsl-novertexdata.c b/tests/shaders/glsl-novertexdata.c index 16a52478..2a8f48d8 100644 --- a/tests/shaders/glsl-novertexdata.c +++ b/tests/shaders/glsl-novertexdata.c @@ -93,7 +93,8 @@ piglit_display(void) expColor) ? PIGLIT_PASS : PIGLIT_FAIL; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/glsl-orangebook-ch06-bump.c b/tests/shaders/glsl-orangebook-ch06-bump.c index f47a36e0..d9bcf49f 100644 --- a/tests/shaders/glsl-orangebook-ch06-bump.c +++ b/tests/shaders/glsl-orangebook-ch06-bump.c @@ -91,7 +91,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(bump_x - w / 16, bump_y - h / 16, test_bump_light); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-preprocessor-comments.c b/tests/shaders/glsl-preprocessor-comments.c index 37fbb1c5..e6636f05 100644 --- a/tests/shaders/glsl-preprocessor-comments.c +++ b/tests/shaders/glsl-preprocessor-comments.c @@ -56,7 +56,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(15, 15, args1); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-routing.c b/tests/shaders/glsl-routing.c index 52d44105..63ba4753 100644 --- a/tests/shaders/glsl-routing.c +++ b/tests/shaders/glsl-routing.c @@ -309,7 +309,8 @@ piglit_display(void) pass = test(conf[i][0], conf[i][1], i) && pass; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-sin.c b/tests/shaders/glsl-sin.c index 76cbed11..b9ea657f 100644 --- a/tests/shaders/glsl-sin.c +++ b/tests/shaders/glsl-sin.c @@ -102,7 +102,8 @@ enum piglit_result piglit_display(void) pass = test(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c index 1a0a853a..2830635e 100644 --- a/tests/shaders/glsl-uniform-update.c +++ b/tests/shaders/glsl-uniform-update.c @@ -63,7 +63,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(30, 30, red); pass &= piglit_probe_pixel_rgb(60, 30, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c index 2a745600..5643a39a 100644 --- a/tests/shaders/glsl-unused-varying.c +++ b/tests/shaders/glsl-unused-varying.c @@ -66,7 +66,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(15, 15, red); pass &= piglit_probe_pixel_rgb(15, 35, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-useprogram-displaylist.c b/tests/shaders/glsl-useprogram-displaylist.c index 56fb0e9d..17a31e80 100644 --- a/tests/shaders/glsl-useprogram-displaylist.c +++ b/tests/shaders/glsl-useprogram-displaylist.c @@ -90,7 +90,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(piglit_width / 2, piglit_height / 2, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-vs-arrays.c b/tests/shaders/glsl-vs-arrays.c index 972e3a23..8f89360a 100644 --- a/tests/shaders/glsl-vs-arrays.c +++ b/tests/shaders/glsl-vs-arrays.c @@ -53,7 +53,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(15, 15, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-vs-functions.c b/tests/shaders/glsl-vs-functions.c index 99410109..b5afe20c 100644 --- a/tests/shaders/glsl-vs-functions.c +++ b/tests/shaders/glsl-vs-functions.c @@ -54,7 +54,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgba(piglit_width / 2, piglit_height / 2, result); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 289b04f8..63fdf454 100644 --- a/tests/shaders/glsl-vs-if-bool.c +++ b/tests/shaders/glsl-vs-if-bool.c @@ -56,7 +56,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(15, 15, red); pass &= piglit_probe_pixel_rgb(35, 15, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 1c557c2b..c8ff601a 100644 --- a/tests/shaders/glsl-vs-loop-nested.c +++ b/tests/shaders/glsl-vs-loop-nested.c @@ -88,7 +88,8 @@ piglit_display(void) } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c index 86ad11bc..5d420ab2 100644 --- a/tests/shaders/glsl-vs-loop.c +++ b/tests/shaders/glsl-vs-loop.c @@ -87,7 +87,8 @@ piglit_display(void) } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 968ce318..c932da0f 100644 --- a/tests/shaders/glsl-vs-mov-after-deref.c +++ b/tests/shaders/glsl-vs-mov-after-deref.c @@ -53,7 +53,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(15, 15, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 54bc02ea..eaea6ca2 100644 --- a/tests/shaders/glsl-vs-mvp-statechange.c +++ b/tests/shaders/glsl-vs-mvp-statechange.c @@ -57,7 +57,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-vs-normalscale.c b/tests/shaders/glsl-vs-normalscale.c index d8e1b444..c93bbe48 100644 --- a/tests/shaders/glsl-vs-normalscale.c +++ b/tests/shaders/glsl-vs-normalscale.c @@ -57,7 +57,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, gray); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 c8d9f066..bb30bb2c 100644 --- a/tests/shaders/glsl-vs-point-size.c +++ b/tests/shaders/glsl-vs-point-size.c @@ -74,7 +74,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1, black); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 2e919a35..68928aba 100644 --- a/tests/shaders/glsl-vs-raytrace-bug26691.c +++ b/tests/shaders/glsl-vs-raytrace-bug26691.c @@ -257,7 +257,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return ((float)passed_cnt > (1.0F-failing_pixel_percentage) *piglit_width*piglit_height) diff --git a/tests/shaders/glsl-vs-sqrt-zero.c b/tests/shaders/glsl-vs-sqrt-zero.c index 85f2efc4..545d7c55 100644 --- a/tests/shaders/glsl-vs-sqrt-zero.c +++ b/tests/shaders/glsl-vs-sqrt-zero.c @@ -50,7 +50,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgb(10, 10, 10, 10, color); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/glsl-vs-statechange-1.c b/tests/shaders/glsl-vs-statechange-1.c index 599b8524..10fcbc45 100644 --- a/tests/shaders/glsl-vs-statechange-1.c +++ b/tests/shaders/glsl-vs-statechange-1.c @@ -67,7 +67,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgba(piglit_width / 2, 0, piglit_width / 2, piglit_height, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 eb30590b..c44b71d3 100644 --- a/tests/shaders/glsl-vs-texturematrix-1.c +++ b/tests/shaders/glsl-vs-texturematrix-1.c @@ -70,7 +70,8 @@ piglit_display(void) piglit_height * 3 / 4, green) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteTextures(1, &tex); diff --git a/tests/shaders/glsl-vs-texturematrix-2.c b/tests/shaders/glsl-vs-texturematrix-2.c index 56b734bd..5400fdc2 100644 --- a/tests/shaders/glsl-vs-texturematrix-2.c +++ b/tests/shaders/glsl-vs-texturematrix-2.c @@ -72,7 +72,8 @@ piglit_display(void) piglit_height * 3 / 4, green) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteTextures(1, &tex); diff --git a/tests/shaders/trinity-fp1.c b/tests/shaders/trinity-fp1.c index 4180d0c3..efa7c36a 100644 --- a/tests/shaders/trinity-fp1.c +++ b/tests/shaders/trinity-fp1.c @@ -136,7 +136,8 @@ piglit_display(void) DoFrame(); succ = DoTest(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return succ ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/useprogram-flushverts-1.c b/tests/shaders/useprogram-flushverts-1.c index b7bd0bfd..31ae7e0f 100644 --- a/tests/shaders/useprogram-flushverts-1.c +++ b/tests/shaders/useprogram-flushverts-1.c @@ -86,7 +86,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgba(piglit_width * 7 / 8, piglit_height / 2, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/useprogram-flushverts-2.c b/tests/shaders/useprogram-flushverts-2.c index 984b2eb8..c5bc0862 100644 --- a/tests/shaders/useprogram-flushverts-2.c +++ b/tests/shaders/useprogram-flushverts-2.c @@ -92,7 +92,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgba(piglit_width * 7 / 8, piglit_height / 2, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/useprogram-refcount-1.c b/tests/shaders/useprogram-refcount-1.c index daf96ee3..997e8335 100644 --- a/tests/shaders/useprogram-refcount-1.c +++ b/tests/shaders/useprogram-refcount-1.c @@ -60,7 +60,8 @@ piglit_display(void) pass &= piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/useshaderprogram-flushverts-1.c b/tests/shaders/useshaderprogram-flushverts-1.c index 58e418ea..94e6849c 100644 --- a/tests/shaders/useshaderprogram-flushverts-1.c +++ b/tests/shaders/useshaderprogram-flushverts-1.c @@ -88,7 +88,8 @@ piglit_display(void) pass &= piglit_probe_pixel_rgba(piglit_width * 7 / 8, piglit_height / 2, blue); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/shaders/vp-address-01.c b/tests/shaders/vp-address-01.c index c78be80b..11bbd883 100644 --- a/tests/shaders/vp-address-01.c +++ b/tests/shaders/vp-address-01.c @@ -105,7 +105,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-address-02.c b/tests/shaders/vp-address-02.c index eb752573..8329dc20 100644 --- a/tests/shaders/vp-address-02.c +++ b/tests/shaders/vp-address-02.c @@ -119,7 +119,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-address-03.c b/tests/shaders/vp-address-03.c index cfa32e7a..b6c8518d 100644 --- a/tests/shaders/vp-address-03.c +++ b/tests/shaders/vp-address-03.c @@ -97,7 +97,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-address-04.c b/tests/shaders/vp-address-04.c index adfc1097..f5998e8c 100644 --- a/tests/shaders/vp-address-04.c +++ b/tests/shaders/vp-address-04.c @@ -176,7 +176,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-address-05.c b/tests/shaders/vp-address-05.c index 8573637c..7c8f9278 100644 --- a/tests/shaders/vp-address-05.c +++ b/tests/shaders/vp-address-05.c @@ -100,7 +100,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-address-06.c b/tests/shaders/vp-address-06.c index 17d981e5..fa340bf5 100644 --- a/tests/shaders/vp-address-06.c +++ b/tests/shaders/vp-address-06.c @@ -99,7 +99,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-clipdistance-01.c b/tests/shaders/vp-clipdistance-01.c index daff12f3..98c5f553 100644 --- a/tests/shaders/vp-clipdistance-01.c +++ b/tests/shaders/vp-clipdistance-01.c @@ -112,7 +112,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-clipdistance-02.c b/tests/shaders/vp-clipdistance-02.c index c7f29efc..77a4a98b 100644 --- a/tests/shaders/vp-clipdistance-02.c +++ b/tests/shaders/vp-clipdistance-02.c @@ -107,7 +107,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-clipdistance-03.c b/tests/shaders/vp-clipdistance-03.c index c30dc02c..fb5cb52f 100644 --- a/tests/shaders/vp-clipdistance-03.c +++ b/tests/shaders/vp-clipdistance-03.c @@ -92,7 +92,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-clipdistance-04.c b/tests/shaders/vp-clipdistance-04.c index 3b43c3b4..7149d30a 100644 --- a/tests/shaders/vp-clipdistance-04.c +++ b/tests/shaders/vp-clipdistance-04.c @@ -97,7 +97,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return result; } diff --git a/tests/shaders/vp-ignore-input.c b/tests/shaders/vp-ignore-input.c index 2e0caa02..6f95348c 100644 --- a/tests/shaders/vp-ignore-input.c +++ b/tests/shaders/vp-ignore-input.c @@ -129,7 +129,8 @@ piglit_display(void) glPopMatrix(); glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 c500ea4e..98f68538 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 @@ -114,7 +114,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); 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 4f18f34a..0d26ed19 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 @@ -184,7 +184,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 1e226847..495a022d 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c @@ -78,7 +78,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(piglit_width * 3 / 4, piglit_height / 2, blue) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 51285659..e06e75eb 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 @@ -136,7 +136,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgba(opos[i*2]+25, opos[i*2+1]+25, &ocol[i*4]) && pass; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 3d8dcc4d..4a9f040c 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c @@ -102,7 +102,8 @@ piglit_display(void) assert(!glGetError()); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 ce8318f0..7a777b55 100644 --- a/tests/spec/arb_instanced_arrays/instanced_arrays.c +++ b/tests/spec/arb_instanced_arrays/instanced_arrays.c @@ -126,7 +126,8 @@ test_instancing(GLuint divisor) TestName, i); fprintf(stderr, "%s: color instance divisor = %u\n", TestName, divisor); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return GL_FALSE; } } @@ -136,7 +137,8 @@ test_instancing(GLuint divisor) glDisableVertexAttribArray(PosAttrib); glDisableVertexAttribArray(ColorAttrib); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return GL_TRUE; } diff --git a/tests/spec/arb_sampler_objects/sampler-incomplete.c b/tests/spec/arb_sampler_objects/sampler-incomplete.c index 4a663862..f0df21cc 100644 --- a/tests/spec/arb_sampler_objects/sampler-incomplete.c +++ b/tests/spec/arb_sampler_objects/sampler-incomplete.c @@ -127,7 +127,8 @@ piglit_display(void) p = piglit_probe_pixel_rgb(piglit_width / 2, piglit_height / 2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 44647c91..383316b0 100644 --- a/tests/spec/arb_sampler_objects/sampler-objects.c +++ b/tests/spec/arb_sampler_objects/sampler-objects.c @@ -212,7 +212,8 @@ test_samplers(void) p = piglit_probe_pixel_rgba(10, 10, exp); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (!p) { fprintf(stderr, "%s failed for sampler %d\n", Prog, i); diff --git a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c index 562cdb9a..b54c13e9 100644 --- a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c +++ b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c @@ -68,7 +68,8 @@ enum piglit_result piglit_display(void) draw_quad(100, 10, 1, 0, 0.99); glDisable(GL_TEXTURE_CUBE_MAP_SEAMLESS); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); pass = piglit_probe_pixel_rgb(20, 20, colors[4]) && pass; pass = piglit_probe_pixel_rgb(50, 20, colors[0]) && pass; diff --git a/tests/spec/arb_shader_texture_lod/execution/texgrad.c b/tests/spec/arb_shader_texture_lod/execution/texgrad.c index 64e8f49b..4e828490 100644 --- a/tests/spec/arb_shader_texture_lod/execution/texgrad.c +++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c @@ -180,7 +180,8 @@ enum piglit_result piglit_display(void) if (!piglit_probe_rect_halves_equal_rgba(0, 0, piglit_width, piglit_height)) pass = GL_FALSE; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 2856dd3e..3d1f95d3 100644 --- a/tests/spec/arb_texture_float/texture-float-formats.c +++ b/tests/spec/arb_texture_float/texture-float-formats.c @@ -334,7 +334,8 @@ test_format(const struct format_info *info) printf("\n"); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return p; } diff --git a/tests/spec/arb_texture_storage/texture-storage.c b/tests/spec/arb_texture_storage/texture-storage.c index 58b06724..3057e3c0 100644 --- a/tests/spec/arb_texture_storage/texture-storage.c +++ b/tests/spec/arb_texture_storage/texture-storage.c @@ -311,7 +311,8 @@ test_2d_mipmap_rendering(void) p = piglit_probe_pixel_rgb(piglit_width/2, piglit_height/2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 597f3a18..1ead9662 100644 --- a/tests/spec/arb_transform_feedback2/draw-auto.c +++ b/tests/spec/arb_transform_feedback2/draw-auto.c @@ -167,7 +167,8 @@ enum piglit_result piglit_display(void) pass = piglit_probe_pixel_rgb(35, 35, clearcolor) && pass; pass = piglit_probe_pixel_rgb(55, 35, blue) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 1b34fb49..b1c6d80d 100644 --- a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c +++ b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c @@ -102,7 +102,8 @@ piglit_display(void) piglit_width / 2, piglit_height / 2, blue) && pass; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 8bd0e1d2..043f6c21 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 @@ -99,7 +99,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 f4dec02e..5ccc97b4 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 @@ -224,7 +224,8 @@ piglit_display(void) } glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 f9acf8b9..2c82cc8f 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-index.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-index.c @@ -140,7 +140,8 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgba(piglit_width / 2, 0, piglit_width / 2, piglit_height, result1); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 c3928064..faa5ee79 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-option.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-option.c @@ -126,7 +126,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 3e7386a2..7cb2f3d0 100644 --- a/tests/spec/ati_draw_buffers/arbfp.c +++ b/tests/spec/ati_draw_buffers/arbfp.c @@ -132,7 +132,8 @@ piglit_display(void) pass = pass && piglit_probe_rect_rgba(piglit_width / 2, 0, piglit_width / 2, piglit_height, result1); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 2bdaa57b..4338a77a 100644 --- a/tests/spec/ati_envmap_bumpmap/bump.c +++ b/tests/spec/ati_envmap_bumpmap/bump.c @@ -179,7 +179,8 @@ piglit_display(void) piglit_height / 2, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 1923b9cc..3ffe7b27 100644 --- a/tests/spec/ext_fog_coord/modes.c +++ b/tests/spec/ext_fog_coord/modes.c @@ -118,7 +118,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 50d3be6a..eb44072c 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 @@ -256,7 +256,8 @@ test_fbo(const struct format_info *info) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 40a37c15..d451b020 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c @@ -101,7 +101,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 e7be7ae1..55aa2a37 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c @@ -105,7 +105,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 9c5efbe2..9be3099a 100644 --- a/tests/spec/nv_conditional_render/bitmap.c +++ b/tests/spec/nv_conditional_render/bitmap.c @@ -87,7 +87,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteQueries(1, &q); free(buf); diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c index 61e72aa3..82b13f2a 100644 --- a/tests/spec/nv_conditional_render/blitframebuffer.c +++ b/tests/spec/nv_conditional_render/blitframebuffer.c @@ -120,7 +120,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteQueries(1, &q); diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c index bec80f45..0d063c7d 100644 --- a/tests/spec/nv_conditional_render/clear.c +++ b/tests/spec/nv_conditional_render/clear.c @@ -81,7 +81,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteQueries(1, &q); diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c index 348fd2ab..59467107 100644 --- a/tests/spec/nv_conditional_render/copypixels.c +++ b/tests/spec/nv_conditional_render/copypixels.c @@ -83,7 +83,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 67234de2..81647459 100644 --- a/tests/spec/nv_conditional_render/copyteximage.c +++ b/tests/spec/nv_conditional_render/copyteximage.c @@ -105,7 +105,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteQueries(1, &q); diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c index 3ae84e7c..a9a92f96 100644 --- a/tests/spec/nv_conditional_render/copytexsubimage.c +++ b/tests/spec/nv_conditional_render/copytexsubimage.c @@ -105,7 +105,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteQueries(1, &q); diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/dlist.c index afc89e77..abc0ec2d 100644 --- a/tests/spec/nv_conditional_render/dlist.c +++ b/tests/spec/nv_conditional_render/dlist.c @@ -76,7 +76,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteQueries(1, &q); diff --git a/tests/spec/nv_conditional_render/drawpixels.c b/tests/spec/nv_conditional_render/drawpixels.c index c65e65c8..2c2bf7be 100644 --- a/tests/spec/nv_conditional_render/drawpixels.c +++ b/tests/spec/nv_conditional_render/drawpixels.c @@ -97,7 +97,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteQueries(1, &q); free(buf); diff --git a/tests/spec/nv_conditional_render/generatemipmap.c b/tests/spec/nv_conditional_render/generatemipmap.c index 7fb332ff..cecb4ce1 100644 --- a/tests/spec/nv_conditional_render/generatemipmap.c +++ b/tests/spec/nv_conditional_render/generatemipmap.c @@ -104,7 +104,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteQueries(1, &q); diff --git a/tests/spec/nv_conditional_render/vertex_array.c b/tests/spec/nv_conditional_render/vertex_array.c index c7ce6ea7..cf540799 100644 --- a/tests/spec/nv_conditional_render/vertex_array.c +++ b/tests/spec/nv_conditional_render/vertex_array.c @@ -81,7 +81,8 @@ piglit_display(void) pass = piglit_probe_rect_rgba(0, 0, piglit_width, piglit_height, green); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 6b28ebfc..f00e8e59 100644 --- a/tests/spec/nv_texture_barrier/blending-in-shader.c +++ b/tests/spec/nv_texture_barrier/blending-in-shader.c @@ -72,7 +72,8 @@ enum piglit_result piglit_display(void) piglit_draw_rect_tex(-1, -1, 2, 2, 0, 0, 1, 1); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 ccc7c0aa..fd546667 100644 --- a/tests/spec/oes_draw_texture/oes_draw_texture.c +++ b/tests/spec/oes_draw_texture/oes_draw_texture.c @@ -207,7 +207,8 @@ piglit_display(void) pass = test_depth() && pass; glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/array-texture.c b/tests/texturing/array-texture.c index 9029b584..d1d6ec70 100644 --- a/tests/texturing/array-texture.c +++ b/tests/texturing/array-texture.c @@ -318,7 +318,8 @@ piglit_display(void) check_error(__LINE__); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/crossbar.c b/tests/texturing/crossbar.c index dd50d0ed..3a43d783 100644 --- a/tests/texturing/crossbar.c +++ b/tests/texturing/crossbar.c @@ -147,7 +147,8 @@ piglit_display(void) { if (piglit_automatic) { DoFrame(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return PIGLIT_PASS; } else { int success, retry; @@ -155,7 +156,8 @@ piglit_display(void) printf("\nFirst frame\n-----------\n"); DoFrame(); success = DoTest(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); printf("\nSecond frame\n------------\n"); glMatrixMode( GL_PROJECTION ); @@ -166,7 +168,8 @@ piglit_display(void) DoFrame(); retry = DoTest(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); if (retry && success) return PIGLIT_PASS; diff --git a/tests/texturing/cubemap.c b/tests/texturing/cubemap.c index fd21b50b..2be16ade 100644 --- a/tests/texturing/cubemap.c +++ b/tests/texturing/cubemap.c @@ -268,7 +268,8 @@ piglit_display(void) i++; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/depth-level-clamp.c b/tests/texturing/depth-level-clamp.c index 6e94cb8f..ed6b1168 100644 --- a/tests/texturing/depth-level-clamp.c +++ b/tests/texturing/depth-level-clamp.c @@ -152,7 +152,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/depth-tex-compare.c b/tests/texturing/depth-tex-compare.c index 0babdee8..9b6ba275 100644 --- a/tests/texturing/depth-tex-compare.c +++ b/tests/texturing/depth-tex-compare.c @@ -240,7 +240,8 @@ piglit_display(void) } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 253454dd..06081213 100644 --- a/tests/texturing/depth-tex-modes-common.c +++ b/tests/texturing/depth-tex-modes-common.c @@ -234,7 +234,8 @@ depth_tex_display(const GLenum *depth_texture_modes, unsigned num_modes, } } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 65c413e2..081415f4 100644 --- a/tests/texturing/depth-tex-modes-glsl.c +++ b/tests/texturing/depth-tex-modes-glsl.c @@ -306,7 +306,8 @@ piglit_display(void) } glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); 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 211b5ef2..4aac88c8 100644 --- a/tests/texturing/fragment-and-vertex-texturing.c +++ b/tests/texturing/fragment-and-vertex-texturing.c @@ -164,7 +164,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(1, 1, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/fxt1-teximage.c b/tests/texturing/fxt1-teximage.c index dc992aca..e1670dc3 100644 --- a/tests/texturing/fxt1-teximage.c +++ b/tests/texturing/fxt1-teximage.c @@ -122,7 +122,8 @@ piglit_display(void) pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 0); pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 1); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/gen-compressed-teximage.c b/tests/texturing/gen-compressed-teximage.c index e4671462..71df0fae 100644 --- a/tests/texturing/gen-compressed-teximage.c +++ b/tests/texturing/gen-compressed-teximage.c @@ -152,7 +152,8 @@ piglit_display(void) pass = pass && check_resulting_mipmaps(0, SIZE, blue); pass = pass && check_resulting_mipmaps(0, SIZE * 2, red); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glFlush(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; diff --git a/tests/texturing/gen-nonzero-unit.c b/tests/texturing/gen-nonzero-unit.c index 72840186..ae15ed3c 100644 --- a/tests/texturing/gen-nonzero-unit.c +++ b/tests/texturing/gen-nonzero-unit.c @@ -161,7 +161,8 @@ piglit_display(void) pass = pass && check_resulting_mipmaps(0, SIZE, blue); pass = pass && check_resulting_mipmaps(0, SIZE * 2, red); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteTextures(3, textures); diff --git a/tests/texturing/gen-teximage.c b/tests/texturing/gen-teximage.c index 324b4674..0e1f0e54 100644 --- a/tests/texturing/gen-teximage.c +++ b/tests/texturing/gen-teximage.c @@ -149,7 +149,8 @@ piglit_display(void) pass = pass && check_resulting_mipmaps(0, SIZE, blue); pass = pass && check_resulting_mipmaps(0, SIZE * 2, red); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteTextures(1, &texture); diff --git a/tests/texturing/gen-texsubimage.c b/tests/texturing/gen-texsubimage.c index 7033f3d4..d44439c6 100644 --- a/tests/texturing/gen-texsubimage.c +++ b/tests/texturing/gen-texsubimage.c @@ -127,7 +127,8 @@ piglit_display(void) pass = pass && check_resulting_mipmaps(0, 0, blue); pass = pass && check_resulting_mipmaps(0, 256, red); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); glDeleteTextures(1, &texture); diff --git a/tests/texturing/getteximage-formats.c b/tests/texturing/getteximage-formats.c index f24c7095..73b51694 100644 --- a/tests/texturing/getteximage-formats.c +++ b/tests/texturing/getteximage-formats.c @@ -440,7 +440,8 @@ test_format(const struct test_desc *test, } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } @@ -511,7 +512,8 @@ piglit_display(void) glClear(GL_COLOR_BUFFER_BIT); draw_format_text(set, &set->format[format_index]); draw_unsupported(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } } diff --git a/tests/texturing/getteximage-simple.c b/tests/texturing/getteximage-simple.c index d61f0a06..4577b1bd 100644 --- a/tests/texturing/getteximage-simple.c +++ b/tests/texturing/getteximage-simple.c @@ -56,7 +56,8 @@ piglit_display(void) glVertex2f(0, 1); glEnd(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); pass = test_getteximage(); diff --git a/tests/texturing/levelclamp.c b/tests/texturing/levelclamp.c index 26d2c267..96683015 100644 --- a/tests/texturing/levelclamp.c +++ b/tests/texturing/levelclamp.c @@ -186,7 +186,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/lodclamp-between-max.c b/tests/texturing/lodclamp-between-max.c index 6559bb9f..a89d6592 100644 --- a/tests/texturing/lodclamp-between-max.c +++ b/tests/texturing/lodclamp-between-max.c @@ -141,7 +141,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/lodclamp-between.c b/tests/texturing/lodclamp-between.c index b8492124..34b61993 100644 --- a/tests/texturing/lodclamp-between.c +++ b/tests/texturing/lodclamp-between.c @@ -141,7 +141,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/lodclamp.c b/tests/texturing/lodclamp.c index 4f844c6d..df67e848 100644 --- a/tests/texturing/lodclamp.c +++ b/tests/texturing/lodclamp.c @@ -186,7 +186,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/mipmap-setup.c b/tests/texturing/mipmap-setup.c index 627ccc00..bd88cf18 100644 --- a/tests/texturing/mipmap-setup.c +++ b/tests/texturing/mipmap-setup.c @@ -154,7 +154,8 @@ test(enum order ord, const char *order) pass &= p; - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } return pass; diff --git a/tests/texturing/rg-draw-pixels.c b/tests/texturing/rg-draw-pixels.c index cbd4c34a..81e44971 100644 --- a/tests/texturing/rg-draw-pixels.c +++ b/tests/texturing/rg-draw-pixels.c @@ -97,7 +97,8 @@ piglit_display(void) pass = pass && piglit_probe_pixel_rgb(20,0,rg); pass = pass && piglit_probe_pixel_rgb(21,0,rg); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; diff --git a/tests/texturing/rg-teximage-common.c b/tests/texturing/rg-teximage-common.c index 1f1a7e07..4ad0d119 100644 --- a/tests/texturing/rg-teximage-common.c +++ b/tests/texturing/rg-teximage-common.c @@ -59,7 +59,8 @@ piglit_display(void) 0.0, 0.0, 1.0, 1.0); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/s3tc-teximage.c b/tests/texturing/s3tc-teximage.c index 53cf1d22..3bca738b 100644 --- a/tests/texturing/s3tc-teximage.c +++ b/tests/texturing/s3tc-teximage.c @@ -131,7 +131,8 @@ piglit_display(void) pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 2); pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 3); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/s3tc-texsubimage.c b/tests/texturing/s3tc-texsubimage.c index 466bce37..eebfdc00 100644 --- a/tests/texturing/s3tc-texsubimage.c +++ b/tests/texturing/s3tc-texsubimage.c @@ -208,7 +208,8 @@ piglit_display(void) pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 2); pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 3); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/streaming-texture-leak.c b/tests/texturing/streaming-texture-leak.c index cfef9cc0..160c829e 100644 --- a/tests/texturing/streaming-texture-leak.c +++ b/tests/texturing/streaming-texture-leak.c @@ -73,7 +73,8 @@ piglit_display(void) pass = piglit_probe_pixel_rgb(piglit_width / 2, piglit_height / 2, expected); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/tex-border-1.c b/tests/texturing/tex-border-1.c index badc9c5a..6fc70208 100644 --- a/tests/texturing/tex-border-1.c +++ b/tests/texturing/tex-border-1.c @@ -90,7 +90,8 @@ piglit_display(void) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c index c065836f..b764d4d5 100644 --- a/tests/texturing/tex-miplevel-selection.c +++ b/tests/texturing/tex-miplevel-selection.c @@ -320,7 +320,8 @@ piglit_display(void) } printf("Summary: %i/%i passed\n", total-failed, total); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return !failed ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/tex-skipped-unit.c b/tests/texturing/tex-skipped-unit.c index 31d6c1e7..4ac12e5c 100644 --- a/tests/texturing/tex-skipped-unit.c +++ b/tests/texturing/tex-skipped-unit.c @@ -121,7 +121,8 @@ piglit_display(void) piglit_height / 2, white); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/tex-srgb.c b/tests/texturing/tex-srgb.c index 3f98ac72..0c49190a 100644 --- a/tests/texturing/tex-srgb.c +++ b/tests/texturing/tex-srgb.c @@ -138,7 +138,8 @@ srgb_tex_test(int srgb_format) glDeleteTextures(1, &tex); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } diff --git a/tests/texturing/tex-swizzle.c b/tests/texturing/tex-swizzle.c index 01211fac..bee409da 100644 --- a/tests/texturing/tex-swizzle.c +++ b/tests/texturing/tex-swizzle.c @@ -216,7 +216,8 @@ piglit_display(void) pass = probes(); glFinish(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c index e49a2e3b..564b876d 100644 --- a/tests/texturing/tex3d-maxsize.c +++ b/tests/texturing/tex3d-maxsize.c @@ -172,7 +172,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); 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 b5b67a3a..5a306181 100644 --- a/tests/texturing/tex3d-npot.c +++ b/tests/texturing/tex3d-npot.c @@ -146,7 +146,8 @@ static int render_and_check(int w, int h, int d, GLenum format, float q, unsigne } free(readback); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return 1; } diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c index 42c24a04..53ebe9f4 100644 --- a/tests/texturing/tex3d.c +++ b/tests/texturing/tex3d.c @@ -146,7 +146,8 @@ static int render_and_check(int w, int h, int d, GLenum format, float q, unsigne } free(readback); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return 1; } diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c index f7bdaafa..6d811afe 100644 --- a/tests/texturing/texdepth.c +++ b/tests/texturing/texdepth.c @@ -337,7 +337,8 @@ piglit_display(void) glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); Tests[CurrentTest].func(Tests[CurrentTest].param); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return PIGLIT_PASS; } diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c index 06c7a96d..3359dff7 100644 --- a/tests/texturing/texrect-many.c +++ b/tests/texturing/texrect-many.c @@ -91,7 +91,8 @@ piglit_display(void) DoFrame(); pass = DoTest(); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/texredefine.c b/tests/texturing/texredefine.c index 2f0676ca..f7a64c39 100644 --- a/tests/texturing/texredefine.c +++ b/tests/texturing/texredefine.c @@ -194,7 +194,8 @@ piglit_display(void) } glDisable(GL_TEXTURE_2D); - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/texturing/texsubimage.c b/tests/texturing/texsubimage.c index 9f8df8ac..a7c44e4b 100644 --- a/tests/texturing/texsubimage.c +++ b/tests/texturing/texsubimage.c @@ -304,7 +304,8 @@ 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(); + if (!piglit_automatic) + glutSwapBuffers(); 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 22ec6090..d8b8cd45 100644 --- a/tests/texturing/texture-al.c +++ b/tests/texturing/texture-al.c @@ -171,7 +171,8 @@ test_teximage_formats(void) return GL_FALSE; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } free(image); diff --git a/tests/texturing/texture-integer.c b/tests/texturing/texture-integer.c index a055c4b7..9e07356b 100644 --- a/tests/texturing/texture-integer.c +++ b/tests/texturing/texture-integer.c @@ -377,7 +377,8 @@ test_format(const struct format_info *info) return GL_FALSE; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); free(buf); diff --git a/tests/texturing/texture-packed-formats.c b/tests/texturing/texture-packed-formats.c index 46c9d127..82cb8c75 100644 --- a/tests/texturing/texture-packed-formats.c +++ b/tests/texturing/texture-packed-formats.c @@ -370,7 +370,8 @@ Test(GLuint intFmt, GLuint dims) glPopMatrix(); } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); return pass; } diff --git a/tests/texturing/texture-rg.c b/tests/texturing/texture-rg.c index 4831c4bc..73854e1a 100644 --- a/tests/texturing/texture-rg.c +++ b/tests/texturing/texture-rg.c @@ -223,7 +223,8 @@ test_teximage_formats(void) return GL_FALSE; } - glutSwapBuffers(); + if (!piglit_automatic) + glutSwapBuffers(); } free(image); |