[Piglit] [PATCH 1/2] enable -fbo for the bulk of shaders/
Chris Forbes
chrisf at ijw.co.nz
Sat Apr 28 19:29:39 PDT 2012
---
tests/shaders/glsl-deriv-varyings.c | 2 +-
tests/shaders/glsl-derivs.c | 2 +-
tests/shaders/glsl-fs-color-matrix.c | 2 +-
tests/shaders/glsl-fs-exp2.c | 2 +-
tests/shaders/glsl-fs-loop-nested.c | 2 +-
tests/shaders/glsl-fs-loop.c | 2 +-
tests/shaders/glsl-fs-mix-constant.c | 2 +-
tests/shaders/glsl-fs-mix.c | 2 +-
tests/shaders/glsl-fs-pointcoord.c | 2 +-
tests/shaders/glsl-fs-sampler-numbering.c | 2 +-
tests/shaders/glsl-fs-sqrt-branch.c | 2 +-
tests/shaders/glsl-fs-sqrt-zero.c | 2 +-
tests/shaders/glsl-fwidth.c | 2 +-
tests/shaders/glsl-getattriblocation.c | 2 +-
tests/shaders/glsl-light-model.c | 2 +-
tests/shaders/glsl-link-empty-prog-02.c | 2 +-
tests/shaders/glsl-lod-bias.c | 2 +-
tests/shaders/glsl-max-varyings.c | 2 +-
tests/shaders/glsl-orangebook-ch06-bump.c | 2 +-
tests/shaders/glsl-preprocessor-comments.c | 2 +-
tests/shaders/glsl-routing.c | 2 +-
tests/shaders/glsl-uniform-update.c | 2 +-
tests/shaders/glsl-unused-varying.c | 2 +-
tests/shaders/glsl-vs-arrays.c | 2 +-
tests/shaders/glsl-vs-if-bool.c | 2 +-
tests/shaders/glsl-vs-loop-nested.c | 2 +-
tests/shaders/glsl-vs-loop.c | 2 +-
tests/shaders/glsl-vs-mov-after-deref.c | 2 +-
tests/shaders/glsl-vs-raytrace-bug26691.c | 2 +-
tests/shaders/glsl-vs-sqrt-zero.c | 2 +-
tests/shaders/vp-address-02.c | 2 +-
31 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/tests/shaders/glsl-deriv-varyings.c b/tests/shaders/glsl-deriv-varyings.c
index fe37326..21f3b2f 100644
--- a/tests/shaders/glsl-deriv-varyings.c
+++ b/tests/shaders/glsl-deriv-varyings.c
@@ -235,7 +235,7 @@ piglit_display(void)
pass = pass && piglit_probe_pixel_rgb(205, 125, deriv);
glFinish();
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-derivs.c b/tests/shaders/glsl-derivs.c
index c2c155e..a9af7ae 100644
--- a/tests/shaders/glsl-derivs.c
+++ b/tests/shaders/glsl-derivs.c
@@ -234,7 +234,7 @@ piglit_display(void)
pass = pass && piglit_probe_pixel_rgb(205, 125, deriv);
glFinish();
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fs-color-matrix.c b/tests/shaders/glsl-fs-color-matrix.c
index 6c70c75..ba2817b 100644
--- a/tests/shaders/glsl-fs-color-matrix.c
+++ b/tests/shaders/glsl-fs-color-matrix.c
@@ -112,7 +112,7 @@ piglit_display(void)
white)
&& pass;
- glutSwapBuffers();
+ piglit_present_results();
glDeleteTextures(1, &tex);
diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c
index 55d8bed..43ec91e 100644
--- a/tests/shaders/glsl-fs-exp2.c
+++ b/tests/shaders/glsl-fs-exp2.c
@@ -56,7 +56,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(15, 15, gray);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fs-loop-nested.c b/tests/shaders/glsl-fs-loop-nested.c
index d458ce7..0b5d22a 100644
--- a/tests/shaders/glsl-fs-loop-nested.c
+++ b/tests/shaders/glsl-fs-loop-nested.c
@@ -89,7 +89,7 @@ piglit_display(void)
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fs-loop.c b/tests/shaders/glsl-fs-loop.c
index b7634d7..9db5601 100644
--- a/tests/shaders/glsl-fs-loop.c
+++ b/tests/shaders/glsl-fs-loop.c
@@ -87,7 +87,7 @@ piglit_display(void)
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fs-mix-constant.c b/tests/shaders/glsl-fs-mix-constant.c
index e2482e4..f012db5 100644
--- a/tests/shaders/glsl-fs-mix-constant.c
+++ b/tests/shaders/glsl-fs-mix-constant.c
@@ -51,7 +51,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgba(15, 15, gray);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fs-mix.c b/tests/shaders/glsl-fs-mix.c
index ed77b38..aeb2e88 100644
--- a/tests/shaders/glsl-fs-mix.c
+++ b/tests/shaders/glsl-fs-mix.c
@@ -58,7 +58,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgba(15, 15, gray);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c
index 267c4e7..7282b70 100644
--- a/tests/shaders/glsl-fs-pointcoord.c
+++ b/tests/shaders/glsl-fs-pointcoord.c
@@ -75,7 +75,7 @@ piglit_display(void)
pass = pass && piglit_probe_pixel_rgb(0, point_size - 1, black);
pass = pass && piglit_probe_pixel_rgb(point_size - 1, point_size - 1, red);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fs-sampler-numbering.c b/tests/shaders/glsl-fs-sampler-numbering.c
index 1fe89cd..a24d305 100644
--- a/tests/shaders/glsl-fs-sampler-numbering.c
+++ b/tests/shaders/glsl-fs-sampler-numbering.c
@@ -60,7 +60,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(x1, y2, white);
pass &= piglit_probe_pixel_rgb(x2, y2, black);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fs-sqrt-branch.c b/tests/shaders/glsl-fs-sqrt-branch.c
index c289be4..7a04c84 100644
--- a/tests/shaders/glsl-fs-sqrt-branch.c
+++ b/tests/shaders/glsl-fs-sqrt-branch.c
@@ -56,7 +56,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(15, 15, result);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fs-sqrt-zero.c b/tests/shaders/glsl-fs-sqrt-zero.c
index aa74e7a..716c147 100644
--- a/tests/shaders/glsl-fs-sqrt-zero.c
+++ b/tests/shaders/glsl-fs-sqrt-zero.c
@@ -50,7 +50,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(15, 15, color);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-fwidth.c b/tests/shaders/glsl-fwidth.c
index 659d214..003cb92 100644
--- a/tests/shaders/glsl-fwidth.c
+++ b/tests/shaders/glsl-fwidth.c
@@ -232,7 +232,7 @@ piglit_display(void)
pass = pass && piglit_probe_pixel_rgb(205, 125, mostlyBlack);
glFinish();
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c
index c5d554b..bbad404 100644
--- a/tests/shaders/glsl-getattriblocation.c
+++ b/tests/shaders/glsl-getattriblocation.c
@@ -105,7 +105,7 @@ piglit_display(void)
glDisableVertexAttribArray(attrib_loc);
- glutSwapBuffers();
+ piglit_present_results();
return result;
}
diff --git a/tests/shaders/glsl-light-model.c b/tests/shaders/glsl-light-model.c
index c785a3e..2e0b108 100644
--- a/tests/shaders/glsl-light-model.c
+++ b/tests/shaders/glsl-light-model.c
@@ -98,7 +98,7 @@ piglit_display(void)
pass = pass && piglit_probe_pixel_rgb(15, 15, green);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-link-empty-prog-02.c b/tests/shaders/glsl-link-empty-prog-02.c
index 8ab0490..0d470c4 100644
--- a/tests/shaders/glsl-link-empty-prog-02.c
+++ b/tests/shaders/glsl-link-empty-prog-02.c
@@ -80,7 +80,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(piglit_width - 1, piglit_height - 1,
black);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-lod-bias.c b/tests/shaders/glsl-lod-bias.c
index 96dac05..afdf9ec 100644
--- a/tests/shaders/glsl-lod-bias.c
+++ b/tests/shaders/glsl-lod-bias.c
@@ -200,7 +200,7 @@ piglit_display(void)
}
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-max-varyings.c b/tests/shaders/glsl-max-varyings.c
index 40b232f..a2644c0 100644
--- a/tests/shaders/glsl-max-varyings.c
+++ b/tests/shaders/glsl-max-varyings.c
@@ -246,7 +246,7 @@ piglit_display(void)
}
}
- glutSwapBuffers();
+ piglit_present_results();
if (!pass)
return PIGLIT_FAIL;
diff --git a/tests/shaders/glsl-orangebook-ch06-bump.c b/tests/shaders/glsl-orangebook-ch06-bump.c
index f47a36e..e68d540 100644
--- a/tests/shaders/glsl-orangebook-ch06-bump.c
+++ b/tests/shaders/glsl-orangebook-ch06-bump.c
@@ -91,7 +91,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(bump_x - w / 16, bump_y - h / 16,
test_bump_light);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-preprocessor-comments.c b/tests/shaders/glsl-preprocessor-comments.c
index 37fbb1c..7f8bdca 100644
--- a/tests/shaders/glsl-preprocessor-comments.c
+++ b/tests/shaders/glsl-preprocessor-comments.c
@@ -56,7 +56,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(15, 15, args1);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-routing.c b/tests/shaders/glsl-routing.c
index 52d4410..8038f5d 100644
--- a/tests/shaders/glsl-routing.c
+++ b/tests/shaders/glsl-routing.c
@@ -309,7 +309,7 @@ piglit_display(void)
pass = test(conf[i][0], conf[i][1], i) && pass;
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c
index 1a0a853..65638d4 100644
--- a/tests/shaders/glsl-uniform-update.c
+++ b/tests/shaders/glsl-uniform-update.c
@@ -63,7 +63,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(30, 30, red);
pass &= piglit_probe_pixel_rgb(60, 30, blue);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c
index 2a74560..38b592f 100644
--- a/tests/shaders/glsl-unused-varying.c
+++ b/tests/shaders/glsl-unused-varying.c
@@ -66,7 +66,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(15, 15, red);
pass &= piglit_probe_pixel_rgb(15, 35, green);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-vs-arrays.c b/tests/shaders/glsl-vs-arrays.c
index 972e3a2..cb0f1a1 100644
--- a/tests/shaders/glsl-vs-arrays.c
+++ b/tests/shaders/glsl-vs-arrays.c
@@ -53,7 +53,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(15, 15, green);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-vs-if-bool.c b/tests/shaders/glsl-vs-if-bool.c
index 289b04f..3fd1728 100644
--- a/tests/shaders/glsl-vs-if-bool.c
+++ b/tests/shaders/glsl-vs-if-bool.c
@@ -56,7 +56,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(15, 15, red);
pass &= piglit_probe_pixel_rgb(35, 15, green);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-vs-loop-nested.c b/tests/shaders/glsl-vs-loop-nested.c
index 1c557c2..da0e6e6 100644
--- a/tests/shaders/glsl-vs-loop-nested.c
+++ b/tests/shaders/glsl-vs-loop-nested.c
@@ -88,7 +88,7 @@ piglit_display(void)
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c
index 86ad11b..fa7b6ab 100644
--- a/tests/shaders/glsl-vs-loop.c
+++ b/tests/shaders/glsl-vs-loop.c
@@ -87,7 +87,7 @@ piglit_display(void)
}
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-vs-mov-after-deref.c b/tests/shaders/glsl-vs-mov-after-deref.c
index 968ce31..948c550 100644
--- a/tests/shaders/glsl-vs-mov-after-deref.c
+++ b/tests/shaders/glsl-vs-mov-after-deref.c
@@ -53,7 +53,7 @@ piglit_display(void)
pass &= piglit_probe_pixel_rgb(15, 15, green);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/glsl-vs-raytrace-bug26691.c b/tests/shaders/glsl-vs-raytrace-bug26691.c
index 2e919a3..a0d0e9c 100644
--- a/tests/shaders/glsl-vs-raytrace-bug26691.c
+++ b/tests/shaders/glsl-vs-raytrace-bug26691.c
@@ -257,7 +257,7 @@ piglit_display(void)
}
}
- glutSwapBuffers();
+ piglit_present_results();
return ((float)passed_cnt > (1.0F-failing_pixel_percentage)
*piglit_width*piglit_height)
diff --git a/tests/shaders/glsl-vs-sqrt-zero.c b/tests/shaders/glsl-vs-sqrt-zero.c
index 85f2efc..6dff9d1 100644
--- a/tests/shaders/glsl-vs-sqrt-zero.c
+++ b/tests/shaders/glsl-vs-sqrt-zero.c
@@ -50,7 +50,7 @@ piglit_display(void)
pass &= piglit_probe_rect_rgb(10, 10, 10, 10, color);
- glutSwapBuffers();
+ piglit_present_results();
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
}
diff --git a/tests/shaders/vp-address-02.c b/tests/shaders/vp-address-02.c
index 28a6917..eb75257 100644
--- a/tests/shaders/vp-address-02.c
+++ b/tests/shaders/vp-address-02.c
@@ -147,7 +147,7 @@ piglit_init(int argc, char **argv)
piglit_report_result(PIGLIT_FAIL);
} else if (max_address_registers == 1) {
- if (glutExtensionSupported("GL_NV_vertex_program2_option")) {
+ if (piglit_is_extension_supported("GL_NV_vertex_program2_option")) {
/* this extension requires two address regs */
if (! piglit_automatic)
printf("GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB "
--
1.7.10
More information about the Piglit
mailing list