[Piglit] [PATCH 1/3] enable -fbo for another batch of things
Chris Forbes
chrisf at ijw.co.nz
Mon Apr 30 13:36:49 PDT 2012
---
tests/all.tests | 116 ++++++++++----------
tests/general/draw-elements-base-vertex-bounds.c | 2 +-
tests/general/draw-elements-base-vertex-neg.c | 2 +-
tests/general/draw-elements-base-vertex.c | 2 +-
.../amd_seamless_cubemap_per_texture.c | 2 +-
.../draw-elements-instanced-base-vertex.c | 2 +-
.../arb_seamless_cube_map/arb_seamless_cubemap.c | 2 +-
tests/texturing/cubemap.c | 2 +-
tests/texturing/depth-level-clamp.c | 2 +-
tests/texturing/depth-tex-compare.c | 2 +-
tests/texturing/depth-tex-modes-common.c | 2 +-
tests/texturing/depth-tex-modes-glsl.c | 2 +-
tests/texturing/fragment-and-vertex-texturing.c | 2 +-
tests/texturing/fxt1-teximage.c | 2 +-
tests/texturing/gen-compressed-teximage.c | 2 +-
tests/texturing/gen-nonzero-unit.c | 2 +-
tests/texturing/gen-teximage.c | 2 +-
tests/texturing/gen-texsubimage.c | 2 +-
tests/texturing/levelclamp.c | 2 +-
tests/texturing/lodclamp-between-max.c | 2 +-
tests/texturing/lodclamp-between.c | 2 +-
tests/texturing/lodclamp.c | 2 +-
tests/texturing/mipmap-setup.c | 2 +-
tests/texturing/rg-draw-pixels.c | 2 +-
tests/texturing/s3tc-teximage.c | 2 +-
tests/texturing/s3tc-texsubimage.c | 2 +-
tests/texturing/streaming-texture-leak.c | 2 +-
tests/texturing/tex-border-1.c | 2 +-
tests/texturing/tex-miplevel-selection.c | 2 +-
tests/texturing/tex-skipped-unit.c | 2 +-
tests/texturing/tex-srgb.c | 4 +-
tests/texturing/tex-swizzle.c | 2 +-
tests/texturing/tex3d-maxsize.c | 4 +-
tests/texturing/tex3d-npot.c | 4 +-
tests/texturing/tex3d.c | 4 +-
tests/texturing/texrect-many.c | 4 +-
tests/texturing/texredefine.c | 4 +-
tests/texturing/texsubimage.c | 2 +-
tests/texturing/texture-al.c | 2 +-
tests/texturing/texture-packed-formats.c | 2 +-
tests/texturing/texture-rg.c | 2 +-
41 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/tests/all.tests b/tests/all.tests
index 8bef587..cf898d5 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -662,68 +662,68 @@ create_context['forward-compatible flag with 3.0'] = PlainExecTest(['glx-create-
texturing = Group()
add_concurrent_test(texturing, '1-1-linear-texture')
add_concurrent_test(texturing, 'array-texture')
-add_plain_test(texturing, 'copytexsubimage')
-add_plain_test(texturing, 'copyteximage')
-add_plain_test(texturing, 'copyteximage-border')
-add_plain_test(texturing, 'copyteximage-clipping')
-add_plain_test(texturing, 'cubemap')
-texturing['cubemap npot'] = PlainExecTest(['cubemap', '-auto', 'npot'])
-add_plain_test(texturing, 'depth-level-clamp')
-add_plain_test(texturing, 'depth-tex-modes')
-add_plain_test(texturing, 'depth-tex-modes-glsl')
-add_plain_test(texturing, 'depth-tex-modes-rg')
-add_plain_test(texturing, 'depth-tex-compare')
-add_plain_test(texturing, 'depth-cube-map')
-add_plain_test(texturing, 'fragment-and-vertex-texturing')
-add_plain_test(texturing, 'fxt1-teximage')
-add_plain_test(texturing, 'gen-teximage')
-add_plain_test(texturing, 'gen-compressed-teximage')
-add_plain_test(texturing, 'gen-nonzero-unit')
-add_plain_test(texturing, 'gen-texsubimage')
+add_concurrent_test(texturing, 'copytexsubimage')
+add_concurrent_test(texturing, 'copyteximage')
+add_concurrent_test(texturing, 'copyteximage-border')
+add_concurrent_test(texturing, 'copyteximage-clipping')
+add_concurrent_test(texturing, 'cubemap')
+texturing['cubemap npot'] = concurrent_test('cubemap npot')
+add_concurrent_test(texturing, 'depth-level-clamp')
+add_concurrent_test(texturing, 'depth-tex-modes')
+add_concurrent_test(texturing, 'depth-tex-modes-glsl')
+add_concurrent_test(texturing, 'depth-tex-modes-rg')
+add_concurrent_test(texturing, 'depth-tex-compare')
+add_concurrent_test(texturing, 'depth-cube-map')
+add_concurrent_test(texturing, 'fragment-and-vertex-texturing')
+add_concurrent_test(texturing, 'fxt1-teximage')
+add_concurrent_test(texturing, 'gen-teximage')
+add_concurrent_test(texturing, 'gen-compressed-teximage')
+add_concurrent_test(texturing, 'gen-nonzero-unit')
+add_concurrent_test(texturing, 'gen-texsubimage')
add_plain_test(texturing, 'getteximage-formats')
add_plain_test(texturing, 'getteximage-simple')
-add_plain_test(texturing, 'getteximage-luminance')
+add_concurrent_test(texturing, 'getteximage-luminance')
texturing['incomplete-texture-fixed'] = concurrent_test('incomplete-texture -auto fixed')
texturing['incomplete-texture-arb_fp'] = concurrent_test('incomplete-texture -auto arb_fp')
texturing['incomplete-texture-glsl'] = concurrent_test('incomplete-texture -auto glsl')
-add_plain_test(texturing, 'levelclamp')
-add_plain_test(texturing, 'lodbias')
-add_plain_test(texturing, 'lodclamp')
-add_plain_test(texturing, 'lodclamp-between')
-add_plain_test(texturing, 'lodclamp-between-max')
-add_plain_test(texturing, 'mipmap-setup')
+add_concurrent_test(texturing, 'levelclamp')
+add_concurrent_test(texturing, 'lodbias')
+add_concurrent_test(texturing, 'lodclamp')
+add_concurrent_test(texturing, 'lodclamp-between')
+add_concurrent_test(texturing, 'lodclamp-between-max')
+add_concurrent_test(texturing, 'mipmap-setup')
add_plain_test(texturing, 'max-texture-size')
-add_plain_test(texturing, 'rg-draw-pixels')
-add_plain_test(texturing, 'rg-teximage-01')
-add_plain_test(texturing, 'rg-teximage-02')
-add_plain_test(texturing, 'rgtc-teximage-01')
-add_plain_test(texturing, 'rgtc-teximage-02')
-add_plain_test(texturing, 's3tc-teximage')
-add_plain_test(texturing, 's3tc-texsubimage')
-add_plain_test(texturing, 'sampler-cube-shadow')
+add_concurrent_test(texturing, 'rg-draw-pixels')
+add_concurrent_test(texturing, 'rg-teximage-01')
+add_concurrent_test(texturing, 'rg-teximage-02')
+add_concurrent_test(texturing, 'rgtc-teximage-01')
+add_concurrent_test(texturing, 'rgtc-teximage-02')
+add_concurrent_test(texturing, 's3tc-teximage')
+add_concurrent_test(texturing, 's3tc-texsubimage')
+add_concurrent_test(texturing, 'sampler-cube-shadow')
add_concurrent_test(texturing, 'sized-texture-format-channels')
-add_plain_test(texturing, 'streaming-texture-leak')
-add_plain_test(texturing, 'tex-border-1')
-texturing['tex-miplevel-selection'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias', '-nolod'])
-texturing['tex-miplevel-selection-lod'] = PlainExecTest(['tex-miplevel-selection', '-auto', '-nobias'])
-texturing['tex-miplevel-selection-lod-bias'] = PlainExecTest(['tex-miplevel-selection', '-auto'])
-add_plain_test(texturing, 'tex-skipped-unit')
-add_plain_test(texturing, 'tex-swizzle')
-add_plain_test(texturing, 'tex3d')
-add_plain_test(texturing, 'tex3d-maxsize')
-add_plain_test(texturing, 'tex3d-npot')
+add_concurrent_test(texturing, 'streaming-texture-leak')
+add_concurrent_test(texturing, 'tex-border-1')
+texturing['tex-miplevel-selection'] = concurrent_test('tex-miplevel-selection -nobias -nolod')
+texturing['tex-miplevel-selection-lod'] = concurrent_test('tex-miplevel-selection -nobias')
+texturing['tex-miplevel-selection-lod-bias'] = concurrent_test('tex-miplevel-selection')
+add_concurrent_test(texturing, 'tex-skipped-unit')
+add_concurrent_test(texturing, 'tex-swizzle')
+add_concurrent_test(texturing, 'tex3d')
+add_concurrent_test(texturing, 'tex3d-maxsize')
+add_concurrent_test(texturing, 'tex3d-npot')
add_plain_test(texturing, 'texdepth')
-add_plain_test(texturing, 'teximage-errors')
-add_plain_test(texturing, 'texrect-many')
-add_plain_test(texturing, 'texredefine')
+add_concurrent_test(texturing, 'teximage-errors')
+add_concurrent_test(texturing, 'texrect-many')
+add_concurrent_test(texturing, 'texredefine')
add_plain_test(texturing, 'texsubimage')
-add_plain_test(texturing, 'texture-al')
+add_concurrent_test(texturing, 'texture-al')
add_plain_test(texturing, 'texture-integer')
-add_plain_test(texturing, 'texture-packed-formats')
-add_plain_test(texturing, 'texture-rg')
-add_plain_test(texturing, 'tex-srgb')
+add_concurrent_test(texturing, 'texture-packed-formats')
+add_concurrent_test(texturing, 'texture-rg')
+add_concurrent_test(texturing, 'tex-srgb')
def texwrap_test(args):
test = PlainExecTest(args + ['-fbo'])
@@ -1048,13 +1048,13 @@ arb_es2_compatibility['FBO blit from missing attachment (ES2 completeness rules)
arb_draw_elements_base_vertex = Group()
spec['ARB_draw_elements_base_vertex'] = arb_draw_elements_base_vertex
arb_draw_elements_base_vertex['dlist-arb_draw_instanced'] = concurrent_test('arb_draw_elements_base_vertex-dlist-arb_draw_instanced')
-add_plain_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex')
-arb_draw_elements_base_vertex['draw-elements-base-vertex-user_varrays'] = PlainExecTest(['draw-elements-base-vertex', '-auto', 'user_varrays'])
-add_plain_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex-neg')
-add_plain_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex-bounds')
-arb_draw_elements_base_vertex['draw-elements-base-vertex-neg-user_varrays'] = PlainExecTest(['draw-elements-base-vertex-neg', '-auto', 'user_varrays'])
-add_plain_test(arb_draw_elements_base_vertex, 'draw-elements-instanced-base-vertex')
-arb_draw_elements_base_vertex['draw-elements-instanced-base-vertex-user_varrays'] = PlainExecTest(['draw-elements-instanced-base-vertex', '-auto', 'user_varrays'])
+add_concurrent_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex')
+arb_draw_elements_base_vertex['draw-elements-base-vertex-user_varrays'] = concurrent_test('draw-elements-base-vertex user_varrays')
+add_concurrent_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex-neg')
+add_concurrent_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex-bounds')
+arb_draw_elements_base_vertex['draw-elements-base-vertex-neg-user_varrays'] = concurrent_test('draw-elements-base-vertex-neg user_varrays')
+add_concurrent_test(arb_draw_elements_base_vertex, 'draw-elements-instanced-base-vertex')
+arb_draw_elements_base_vertex['draw-elements-instanced-base-vertex-user_varrays'] = concurrent_test('draw-elements-instanced-base-vertex user_varrays')
# Group ARB_draw_instanced
arb_draw_instanced = Group()
@@ -1655,7 +1655,7 @@ arb_multisample['pushpop'] = concurrent_test('arb_multisample-pushpop')
arb_seamless_cube_map = Group()
spec['ARB_seamless_cube_map'] = arb_seamless_cube_map
-add_plain_test(arb_seamless_cube_map, 'arb_seamless_cubemap')
+add_concurrent_test(arb_seamless_cube_map, 'arb_seamless_cubemap')
amd_seamless_cubemap_per_texture = Group()
spec['AMD_seamless_cubemap_per_texture'] = amd_seamless_cubemap_per_texture
diff --git a/tests/general/draw-elements-base-vertex-bounds.c b/tests/general/draw-elements-base-vertex-bounds.c
index bdcdba7..c580157 100644
--- a/tests/general/draw-elements-base-vertex-bounds.c
+++ b/tests/general/draw-elements-base-vertex-bounds.c
@@ -114,7 +114,7 @@ piglit_display(void)
pass = piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1, test_colors[2]) && pass;
pass = piglit_probe_pixel_rgb(0, piglit_height - 1, test_colors[3]) && pass;
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c
index ce45d74..46b42c4 100644
--- a/tests/general/draw-elements-base-vertex-neg.c
+++ b/tests/general/draw-elements-base-vertex-neg.c
@@ -131,7 +131,7 @@ enum piglit_result piglit_display(void)
}
glFinish();
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/general/draw-elements-base-vertex.c b/tests/general/draw-elements-base-vertex.c
index f61d86e..b42ba0c 100644
--- a/tests/general/draw-elements-base-vertex.c
+++ b/tests/general/draw-elements-base-vertex.c
@@ -143,7 +143,7 @@ piglit_display(void)
}
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
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 c500ea4..cc7974f 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,7 @@ enum piglit_result piglit_display(void)
pass = piglit_probe_pixel_rgb(200, 50, violet) && pass;
pass = piglit_probe_pixel_rgb(230, 50, violet) && pass;
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c b/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c
index 4f18f34..c27f640 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,7 @@ piglit_display(void)
}
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
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 562cdb9..98b4a9a 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,7 @@ enum piglit_result piglit_display(void)
draw_quad(100, 10, 1, 0, 0.99);
glDisable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
- glutSwapBuffers();
+ piglit_present_results();
pass = piglit_probe_pixel_rgb(20, 20, colors[4]) && pass;
pass = piglit_probe_pixel_rgb(50, 20, colors[0]) && pass;
diff --git a/tests/texturing/cubemap.c b/tests/texturing/cubemap.c
index fd21b50..088df7f 100644
--- a/tests/texturing/cubemap.c
+++ b/tests/texturing/cubemap.c
@@ -268,7 +268,7 @@ piglit_display(void)
i++;
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/depth-level-clamp.c b/tests/texturing/depth-level-clamp.c
index 6e94cb8..4c1f447 100644
--- a/tests/texturing/depth-level-clamp.c
+++ b/tests/texturing/depth-level-clamp.c
@@ -152,7 +152,7 @@ piglit_display(void)
glDeleteTextures(1, &tex);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/depth-tex-compare.c b/tests/texturing/depth-tex-compare.c
index 0babdee..90b71f4 100644
--- a/tests/texturing/depth-tex-compare.c
+++ b/tests/texturing/depth-tex-compare.c
@@ -240,7 +240,7 @@ piglit_display(void)
}
}
- glutSwapBuffers();
+ piglit_present_results();
printf("Left to Right: ALPHA, LUMINANCE, INTENSITY\n");
printf("Top to Bottom: LESS, LEQUAL, GREATER, GEQUAL, "
diff --git a/tests/texturing/depth-tex-modes-common.c b/tests/texturing/depth-tex-modes-common.c
index 253454d..7049c81 100644
--- a/tests/texturing/depth-tex-modes-common.c
+++ b/tests/texturing/depth-tex-modes-common.c
@@ -234,7 +234,7 @@ depth_tex_display(const GLenum *depth_texture_modes, unsigned num_modes,
}
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/depth-tex-modes-glsl.c b/tests/texturing/depth-tex-modes-glsl.c
index 65c413e..225e762 100644
--- a/tests/texturing/depth-tex-modes-glsl.c
+++ b/tests/texturing/depth-tex-modes-glsl.c
@@ -306,7 +306,7 @@ piglit_display(void)
}
glFinish();
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
diff --git a/tests/texturing/fragment-and-vertex-texturing.c b/tests/texturing/fragment-and-vertex-texturing.c
index 211b5ef..f164a30 100644
--- a/tests/texturing/fragment-and-vertex-texturing.c
+++ b/tests/texturing/fragment-and-vertex-texturing.c
@@ -164,7 +164,7 @@ piglit_display(void)
pass = piglit_probe_pixel_rgb(1, 1, expected);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/fxt1-teximage.c b/tests/texturing/fxt1-teximage.c
index dc992ac..5ef17c6 100644
--- a/tests/texturing/fxt1-teximage.c
+++ b/tests/texturing/fxt1-teximage.c
@@ -122,7 +122,7 @@ piglit_display(void)
pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 0);
pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 1);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/gen-compressed-teximage.c b/tests/texturing/gen-compressed-teximage.c
index e467146..4e9482e 100644
--- a/tests/texturing/gen-compressed-teximage.c
+++ b/tests/texturing/gen-compressed-teximage.c
@@ -152,7 +152,7 @@ piglit_display(void)
pass = pass && check_resulting_mipmaps(0, SIZE, blue);
pass = pass && check_resulting_mipmaps(0, SIZE * 2, red);
- glutSwapBuffers();
+ piglit_present_results();
glFlush();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
diff --git a/tests/texturing/gen-nonzero-unit.c b/tests/texturing/gen-nonzero-unit.c
index 7284018..003df07 100644
--- a/tests/texturing/gen-nonzero-unit.c
+++ b/tests/texturing/gen-nonzero-unit.c
@@ -161,7 +161,7 @@ piglit_display(void)
pass = pass && check_resulting_mipmaps(0, SIZE, blue);
pass = pass && check_resulting_mipmaps(0, SIZE * 2, red);
- glutSwapBuffers();
+ piglit_present_results();
glDeleteTextures(3, textures);
diff --git a/tests/texturing/gen-teximage.c b/tests/texturing/gen-teximage.c
index 324b467..2085167 100644
--- a/tests/texturing/gen-teximage.c
+++ b/tests/texturing/gen-teximage.c
@@ -149,7 +149,7 @@ piglit_display(void)
pass = pass && check_resulting_mipmaps(0, SIZE, blue);
pass = pass && check_resulting_mipmaps(0, SIZE * 2, red);
- glutSwapBuffers();
+ piglit_present_results();
glDeleteTextures(1, &texture);
diff --git a/tests/texturing/gen-texsubimage.c b/tests/texturing/gen-texsubimage.c
index 7033f3d..8eaad07 100644
--- a/tests/texturing/gen-texsubimage.c
+++ b/tests/texturing/gen-texsubimage.c
@@ -127,7 +127,7 @@ piglit_display(void)
pass = pass && check_resulting_mipmaps(0, 0, blue);
pass = pass && check_resulting_mipmaps(0, 256, red);
- glutSwapBuffers();
+ piglit_present_results();
glDeleteTextures(1, &texture);
diff --git a/tests/texturing/levelclamp.c b/tests/texturing/levelclamp.c
index 26d2c26..edeaa05 100644
--- a/tests/texturing/levelclamp.c
+++ b/tests/texturing/levelclamp.c
@@ -186,7 +186,7 @@ piglit_display(void)
glDeleteTextures(1, &tex);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/lodclamp-between-max.c b/tests/texturing/lodclamp-between-max.c
index 6559bb9..084179a 100644
--- a/tests/texturing/lodclamp-between-max.c
+++ b/tests/texturing/lodclamp-between-max.c
@@ -141,7 +141,7 @@ piglit_display(void)
glDeleteTextures(1, &tex);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/lodclamp-between.c b/tests/texturing/lodclamp-between.c
index b849212..4d6f163 100644
--- a/tests/texturing/lodclamp-between.c
+++ b/tests/texturing/lodclamp-between.c
@@ -141,7 +141,7 @@ piglit_display(void)
glDeleteTextures(1, &tex);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/lodclamp.c b/tests/texturing/lodclamp.c
index 4f844c6..be32812 100644
--- a/tests/texturing/lodclamp.c
+++ b/tests/texturing/lodclamp.c
@@ -186,7 +186,7 @@ piglit_display(void)
glDeleteTextures(1, &tex);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/mipmap-setup.c b/tests/texturing/mipmap-setup.c
index 627ccc0..be13f14 100644
--- a/tests/texturing/mipmap-setup.c
+++ b/tests/texturing/mipmap-setup.c
@@ -154,7 +154,7 @@ test(enum order ord, const char *order)
pass &= p;
- glutSwapBuffers();
+ piglit_present_results();
}
return pass;
diff --git a/tests/texturing/rg-draw-pixels.c b/tests/texturing/rg-draw-pixels.c
index cbd4c34..6d8f8ca 100644
--- a/tests/texturing/rg-draw-pixels.c
+++ b/tests/texturing/rg-draw-pixels.c
@@ -97,7 +97,7 @@ piglit_display(void)
pass = pass && piglit_probe_pixel_rgb(20,0,rg);
pass = pass && piglit_probe_pixel_rgb(21,0,rg);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
diff --git a/tests/texturing/s3tc-teximage.c b/tests/texturing/s3tc-teximage.c
index 53cf1d2..a214610 100644
--- a/tests/texturing/s3tc-teximage.c
+++ b/tests/texturing/s3tc-teximage.c
@@ -131,7 +131,7 @@ piglit_display(void)
pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 2);
pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 3);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/s3tc-texsubimage.c b/tests/texturing/s3tc-texsubimage.c
index 466bce3..4d8c61f 100644
--- a/tests/texturing/s3tc-texsubimage.c
+++ b/tests/texturing/s3tc-texsubimage.c
@@ -208,7 +208,7 @@ piglit_display(void)
pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 2);
pass = pass && check_resulting_mipmaps(10, 10 + (10 + SIZE) * 3);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/streaming-texture-leak.c b/tests/texturing/streaming-texture-leak.c
index cfef9cc..bdc89bb 100644
--- a/tests/texturing/streaming-texture-leak.c
+++ b/tests/texturing/streaming-texture-leak.c
@@ -73,7 +73,7 @@ piglit_display(void)
pass = piglit_probe_pixel_rgb(piglit_width / 2, piglit_height / 2,
expected);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/tex-border-1.c b/tests/texturing/tex-border-1.c
index badc9c5..f696dc2 100644
--- a/tests/texturing/tex-border-1.c
+++ b/tests/texturing/tex-border-1.c
@@ -90,7 +90,7 @@ piglit_display(void)
glDeleteTextures(1, &tex);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c
index c065836..0375d7d 100644
--- a/tests/texturing/tex-miplevel-selection.c
+++ b/tests/texturing/tex-miplevel-selection.c
@@ -320,7 +320,7 @@ piglit_display(void)
}
printf("Summary: %i/%i passed\n", total-failed, total);
- glutSwapBuffers();
+ piglit_present_results();
return !failed ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/tex-skipped-unit.c b/tests/texturing/tex-skipped-unit.c
index 31d6c1e..8305e64 100644
--- a/tests/texturing/tex-skipped-unit.c
+++ b/tests/texturing/tex-skipped-unit.c
@@ -121,7 +121,7 @@ piglit_display(void)
piglit_height / 2,
white);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/tex-srgb.c b/tests/texturing/tex-srgb.c
index 1f53508..b71a83e 100644
--- a/tests/texturing/tex-srgb.c
+++ b/tests/texturing/tex-srgb.c
@@ -91,7 +91,7 @@ srgb_tex_test(int srgb_format)
GLuint tex;
GLboolean have_decode;
- have_decode = glutExtensionSupported("GL_EXT_texture_sRGB_decode");
+ have_decode = piglit_is_extension_supported("GL_EXT_texture_sRGB_decode");
glGenTextures(1, &tex);
@@ -138,7 +138,7 @@ srgb_tex_test(int srgb_format)
glDeleteTextures(1, &tex);
- glutSwapBuffers();
+ piglit_present_results();
return pass;
}
diff --git a/tests/texturing/tex-swizzle.c b/tests/texturing/tex-swizzle.c
index 01211fa..e3fa1c1 100644
--- a/tests/texturing/tex-swizzle.c
+++ b/tests/texturing/tex-swizzle.c
@@ -216,7 +216,7 @@ piglit_display(void)
pass = probes();
glFinish();
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c
index e49a2e3..5d0a03e 100644
--- a/tests/texturing/tex3d-maxsize.c
+++ b/tests/texturing/tex3d-maxsize.c
@@ -172,7 +172,7 @@ piglit_display(void)
piglit_height * 3 / 4, c1) && pass;
pass = piglit_probe_pixel_rgb(piglit_width * 3 / 4,
piglit_height * 3 / 4, c2) && pass;
- glutSwapBuffers();
+ piglit_present_results();
if (!pass) {
printf("%s: failed at size %d x %d x %d\n", TestName,
@@ -197,7 +197,7 @@ void piglit_init(int argc, char **argv)
piglit_report_result(PIGLIT_SKIP);
}
- glutReshapeFunc(Reshape);
+/* glutReshapeFunc(Reshape); */
glDisable(GL_DITHER);
Reshape(piglit_width, piglit_height);
}
diff --git a/tests/texturing/tex3d-npot.c b/tests/texturing/tex3d-npot.c
index b5b67a3..9de2ede 100644
--- a/tests/texturing/tex3d-npot.c
+++ b/tests/texturing/tex3d-npot.c
@@ -146,7 +146,7 @@ static int render_and_check(int w, int h, int d, GLenum format, float q, unsigne
}
free(readback);
- glutSwapBuffers();
+ piglit_present_results();
return 1;
}
@@ -231,7 +231,7 @@ piglit_init(int argc, char **argv)
piglit_automatic = GL_TRUE;
piglit_require_extension("GL_ARB_texture_non_power_of_two");
- glutReshapeFunc(Reshape);
+ /* glutReshapeFunc(Reshape); */
glDisable(GL_DITHER);
diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c
index 42c24a0..b07a400 100644
--- a/tests/texturing/tex3d.c
+++ b/tests/texturing/tex3d.c
@@ -146,7 +146,7 @@ static int render_and_check(int w, int h, int d, GLenum format, float q, unsigne
}
free(readback);
- glutSwapBuffers();
+ piglit_present_results();
return 1;
}
@@ -230,7 +230,7 @@ piglit_init(int argc, char **argv)
piglit_automatic = GL_TRUE;
- glutReshapeFunc(Reshape);
+/* glutReshapeFunc(Reshape); */
glDisable(GL_DITHER);
diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c
index 06c7a96..9916c1a 100644
--- a/tests/texturing/texrect-many.c
+++ b/tests/texturing/texrect-many.c
@@ -91,7 +91,7 @@ piglit_display(void)
DoFrame();
pass = DoTest();
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
@@ -119,7 +119,7 @@ void piglit_init(int argc, char **argv)
piglit_report_result(PIGLIT_SKIP);
}
- glutReshapeFunc(Reshape);
+ /*glutReshapeFunc(Reshape);*/
piglit_require_extension("GL_ARB_texture_rectangle");
diff --git a/tests/texturing/texredefine.c b/tests/texturing/texredefine.c
index 2f0676c..7e00ecb 100644
--- a/tests/texturing/texredefine.c
+++ b/tests/texturing/texredefine.c
@@ -194,7 +194,7 @@ piglit_display(void)
}
glDisable(GL_TEXTURE_2D);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
@@ -209,7 +209,7 @@ static void Reshape(int width, int height)
void piglit_init(int argc, char **argv)
{
- glutReshapeFunc(Reshape);
+ /*glutReshapeFunc(Reshape);*/
Reshape(piglit_width, piglit_height);
}
diff --git a/tests/texturing/texsubimage.c b/tests/texturing/texsubimage.c
index 9f8df8a..cf6601b 100644
--- a/tests/texturing/texsubimage.c
+++ b/tests/texturing/texsubimage.c
@@ -304,7 +304,7 @@ test_format(GLenum target, GLenum intFormat)
piglit_draw_rect_tex3d(0, 0, w, h, 0.0, 0.0, 1.0, 1.0, 0.0, 1.0);
glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, testImg);
- glutSwapBuffers();
+ piglit_present_results();
if (!equal_images(ref, testImg, w, h)) {
printf("texsubimage failed\n");
diff --git a/tests/texturing/texture-al.c b/tests/texturing/texture-al.c
index 22ec609..93d4c74 100644
--- a/tests/texturing/texture-al.c
+++ b/tests/texturing/texture-al.c
@@ -171,7 +171,7 @@ test_teximage_formats(void)
return GL_FALSE;
}
- glutSwapBuffers();
+ piglit_present_results();
}
free(image);
diff --git a/tests/texturing/texture-packed-formats.c b/tests/texturing/texture-packed-formats.c
index 46c9d12..4b316ec 100644
--- a/tests/texturing/texture-packed-formats.c
+++ b/tests/texturing/texture-packed-formats.c
@@ -370,7 +370,7 @@ Test(GLuint intFmt, GLuint dims)
glPopMatrix();
}
- glutSwapBuffers();
+ piglit_present_results();
return pass;
}
diff --git a/tests/texturing/texture-rg.c b/tests/texturing/texture-rg.c
index 4831c4b..ff2bc7c 100644
--- a/tests/texturing/texture-rg.c
+++ b/tests/texturing/texture-rg.c
@@ -223,7 +223,7 @@ test_teximage_formats(void)
return GL_FALSE;
}
- glutSwapBuffers();
+ piglit_present_results();
}
free(image);
--
1.7.10
More information about the Piglit
mailing list