diff options
Diffstat (limited to 'tests/general')
73 files changed, 174 insertions, 87 deletions
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; } |