diff options
Diffstat (limited to 'tests/fbo')
58 files changed, 102 insertions, 102 deletions
diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c index 6572cfd95..b998f0b4b 100644 --- a/tests/fbo/fbo-1d.c +++ b/tests/fbo/fbo-1d.c @@ -137,7 +137,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-3d.c b/tests/fbo/fbo-3d.c index 1340e97ab..c5287e294 100644 --- a/tests/fbo/fbo-3d.c +++ b/tests/fbo/fbo-3d.c @@ -178,7 +178,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-alpha.c b/tests/fbo/fbo-alpha.c index 479dabea4..48da59ba5 100644 --- a/tests/fbo/fbo-alpha.c +++ b/tests/fbo/fbo-alpha.c @@ -138,7 +138,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-alphatest-formats.c b/tests/fbo/fbo-alphatest-formats.c index 8a7ac5de4..0c8d30800 100644 --- a/tests/fbo/fbo-alphatest-formats.c +++ b/tests/fbo/fbo-alphatest-formats.c @@ -273,7 +273,7 @@ static enum piglit_result test_format(const struct format_desc *format, GLenum b glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-array.c b/tests/fbo/fbo-array.c index 458b0016b..fa3b78aff 100644 --- a/tests/fbo/fbo-array.c +++ b/tests/fbo/fbo-array.c @@ -207,7 +207,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-blending-formats.c b/tests/fbo/fbo-blending-formats.c index 5b806465f..96372107e 100644 --- a/tests/fbo/fbo-blending-formats.c +++ b/tests/fbo/fbo-blending-formats.c @@ -324,7 +324,7 @@ static enum piglit_result test_format(const struct format_desc *format, GLenum b glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-blit-d24s8.c b/tests/fbo/fbo-blit-d24s8.c index 324082b9f..f5373aa14 100644 --- a/tests/fbo/fbo-blit-d24s8.c +++ b/tests/fbo/fbo-blit-d24s8.c @@ -196,7 +196,7 @@ run_test(void) err = glGetError(); if (err != GL_NO_ERROR) { printf("Unexpected GL error state 0x%04x\n", err); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } /* WIN(bottom) -> FBO(middle) */ @@ -241,7 +241,7 @@ piglit_display(void) { GLboolean pass = run_test(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-blit.c b/tests/fbo/fbo-blit.c index 81442515a..c1b8b2a81 100644 --- a/tests/fbo/fbo-blit.c +++ b/tests/fbo/fbo-blit.c @@ -205,7 +205,7 @@ piglit_display(void) { GLboolean pass = run_test(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-clear-formats.c b/tests/fbo/fbo-clear-formats.c index 7272de53e..b58a470e9 100644 --- a/tests/fbo/fbo-clear-formats.c +++ b/tests/fbo/fbo-clear-formats.c @@ -425,7 +425,7 @@ test_format(const struct format_desc *format, GLenum baseformat) glDeleteTextures(1, &tex); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } enum piglit_result piglit_display(void) diff --git a/tests/fbo/fbo-clearmipmap.c b/tests/fbo/fbo-clearmipmap.c index 15bf776ed..36a2b8d3a 100644 --- a/tests/fbo/fbo-clearmipmap.c +++ b/tests/fbo/fbo-clearmipmap.c @@ -166,5 +166,5 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-copypix.c b/tests/fbo/fbo-copypix.c index 73162e06b..87dde533b 100644 --- a/tests/fbo/fbo-copypix.c +++ b/tests/fbo/fbo-copypix.c @@ -202,7 +202,7 @@ piglit_display(void) { GLboolean pass = run_test(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-copyteximage-simple.c b/tests/fbo/fbo-copyteximage-simple.c index dc163c0a3..a22f2f9e7 100644 --- a/tests/fbo/fbo-copyteximage-simple.c +++ b/tests/fbo/fbo-copyteximage-simple.c @@ -135,7 +135,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-copyteximage.c b/tests/fbo/fbo-copyteximage.c index 376d0cf69..876bb9032 100644 --- a/tests/fbo/fbo-copyteximage.c +++ b/tests/fbo/fbo-copyteximage.c @@ -138,7 +138,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-cubemap.c b/tests/fbo/fbo-cubemap.c index de011932c..266a0cad1 100644 --- a/tests/fbo/fbo-cubemap.c +++ b/tests/fbo/fbo-cubemap.c @@ -195,7 +195,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-depth-array.c b/tests/fbo/fbo-depth-array.c index 6e93c72c5..8c796c4d4 100644 --- a/tests/fbo/fbo-depth-array.c +++ b/tests/fbo/fbo-depth-array.c @@ -230,7 +230,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-depth-sample-compare.c b/tests/fbo/fbo-depth-sample-compare.c index 96ff6d1bd..6f64ba0a5 100644 --- a/tests/fbo/fbo-depth-sample-compare.c +++ b/tests/fbo/fbo-depth-sample-compare.c @@ -303,9 +303,9 @@ count_and_report_bad_pixels(void) /* XXX this error test is a total hack for now */ if (error > ErrorScale) - return PIGLIT_FAILURE; + return PIGLIT_FAIL; else - return PIGLIT_SUCCESS; + return PIGLIT_PASS; } diff --git a/tests/fbo/fbo-depth.c b/tests/fbo/fbo-depth.c index cac5af58a..daa3a1de9 100644 --- a/tests/fbo/fbo-depth.c +++ b/tests/fbo/fbo-depth.c @@ -194,7 +194,7 @@ enum piglit_result piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-depthtex.c b/tests/fbo/fbo-depthtex.c index 26e5f0c3f..a6653e304 100644 --- a/tests/fbo/fbo-depthtex.c +++ b/tests/fbo/fbo-depthtex.c @@ -135,7 +135,7 @@ enum piglit_result piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-draw-buffers-blend.c b/tests/fbo/fbo-draw-buffers-blend.c index 96ad5a1aa..02e9e7206 100644 --- a/tests/fbo/fbo-draw-buffers-blend.c +++ b/tests/fbo/fbo-draw-buffers-blend.c @@ -54,7 +54,7 @@ my_assert(int test, const char *text) { if (!test) { printf("%s: assertion %s failed\n", TestName, text); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); exit(1); } } @@ -67,7 +67,7 @@ check_error(int line) if (err) { printf("%s: Unexpected error 0x%x at line %d\n", TestName, err, line); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } } @@ -185,11 +185,11 @@ test(void) if (!piglit_probe_pixel_rgba(5, 5, expected[i])) { printf("For color buffer %d\n", i); - return PIGLIT_FAILURE; + return PIGLIT_FAIL; } } - return PIGLIT_SUCCESS; + return PIGLIT_PASS; } diff --git a/tests/fbo/fbo-drawbuffers-arbfp.c b/tests/fbo/fbo-drawbuffers-arbfp.c index 625e50f9f..13086c881 100644 --- a/tests/fbo/fbo-drawbuffers-arbfp.c +++ b/tests/fbo/fbo-drawbuffers-arbfp.c @@ -133,7 +133,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-drawbuffers-blend-add.c b/tests/fbo/fbo-drawbuffers-blend-add.c index 1710e254d..c5722fc15 100644 --- a/tests/fbo/fbo-drawbuffers-blend-add.c +++ b/tests/fbo/fbo-drawbuffers-blend-add.c @@ -216,7 +216,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-drawbuffers-fragcolor.c b/tests/fbo/fbo-drawbuffers-fragcolor.c index f6ed72145..561ecf400 100644 --- a/tests/fbo/fbo-drawbuffers-fragcolor.c +++ b/tests/fbo/fbo-drawbuffers-fragcolor.c @@ -164,7 +164,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-drawbuffers-maxtargets.c b/tests/fbo/fbo-drawbuffers-maxtargets.c index 968d8266a..061527077 100644 --- a/tests/fbo/fbo-drawbuffers-maxtargets.c +++ b/tests/fbo/fbo-drawbuffers-maxtargets.c @@ -120,7 +120,7 @@ generate_and_display_drawbuffers(int count) error = glGetError(); if (error) { fprintf(stderr, "glUseProgram error: 0x%x\n", error); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } /* Now render to all the color buffers. */ @@ -172,7 +172,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-drawbuffers.c b/tests/fbo/fbo-drawbuffers.c index cf4376c77..61127e0b9 100644 --- a/tests/fbo/fbo-drawbuffers.c +++ b/tests/fbo/fbo-drawbuffers.c @@ -119,7 +119,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-drawbuffers2-blend.c b/tests/fbo/fbo-drawbuffers2-blend.c index 151d62099..c73591b5b 100644 --- a/tests/fbo/fbo-drawbuffers2-blend.c +++ b/tests/fbo/fbo-drawbuffers2-blend.c @@ -130,7 +130,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-drawbuffers2-colormask.c b/tests/fbo/fbo-drawbuffers2-colormask.c index 76fb1fa49..4c38fd0b4 100644 --- a/tests/fbo/fbo-drawbuffers2-colormask.c +++ b/tests/fbo/fbo-drawbuffers2-colormask.c @@ -128,7 +128,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-flushing.c b/tests/fbo/fbo-flushing.c index 1979488c7..3272c8fe1 100644 --- a/tests/fbo/fbo-flushing.c +++ b/tests/fbo/fbo-flushing.c @@ -123,7 +123,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-formats.h b/tests/fbo/fbo-formats.h index 9cfd9e191..88b9ab8f3 100644 --- a/tests/fbo/fbo-formats.h +++ b/tests/fbo/fbo-formats.h @@ -570,7 +570,7 @@ static void add_result(bool *all_skip, enum piglit_result *end_result, if (new != PIGLIT_SKIP) *all_skip = false; - if (new == PIGLIT_FAILURE) + if (new == PIGLIT_FAIL) *end_result = new; } @@ -578,7 +578,7 @@ typedef enum piglit_result (*test_func)(const struct format_desc *format, GLenum static enum piglit_result fbo_formats_display(test_func test_format) { - enum piglit_result result, end_result = PIGLIT_SUCCESS; + enum piglit_result result, end_result = PIGLIT_PASS; bool all_skip = true; int i; diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c index 1d7e35a1c..830214b34 100644 --- a/tests/fbo/fbo-fragcoord.c +++ b/tests/fbo/fbo-fragcoord.c @@ -71,7 +71,7 @@ create_fbo(unsigned width, unsigned height, GLuint *out_tex) glDeleteFramebuffersEXT(1, &fb); glDeleteTextures(1, &tex); piglit_report_result((status == GL_FRAMEBUFFER_UNSUPPORTED_EXT) - ? PIGLIT_SKIP : PIGLIT_FAILURE); + ? PIGLIT_SKIP : PIGLIT_FAIL); } *out_tex = tex; @@ -131,7 +131,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c index 4f294a3e3..48230e48b 100644 --- a/tests/fbo/fbo-fragcoord2.c +++ b/tests/fbo/fbo-fragcoord2.c @@ -72,7 +72,7 @@ check_error(int line) if (err) { printf("%s: Unexpected error 0x%x at line %d\n", TestName, err, line); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } } @@ -124,7 +124,7 @@ test(void) static const GLfloat half_green[4] = {0, 0.5, 0, 1}; static const GLfloat green_half_red[4] = {0.5, 1, 0, 1}; GLenum buffer; - enum piglit_result result = PIGLIT_SUCCESS; + enum piglit_result result = PIGLIT_PASS; create_fbo(); @@ -170,24 +170,24 @@ test(void) /* left half probes */ if (!piglit_probe_pixel_rgb(0, 0, black)) { - result = PIGLIT_FAILURE; + result = PIGLIT_FAIL; } if (!piglit_probe_pixel_rgb(piglit_width/2-1, 0, half_red)) { - result = PIGLIT_FAILURE; + result = PIGLIT_FAIL; } if (!piglit_probe_pixel_rgb(0, piglit_height/2, half_green)) { - result = PIGLIT_FAILURE; + result = PIGLIT_FAIL; } if (!piglit_probe_pixel_rgb(piglit_width/2-1, piglit_height-1, green_half_red)) { - result = PIGLIT_FAILURE; + result = PIGLIT_FAIL; } /* right half probe */ if (!piglit_probe_pixel_rgb(piglit_width*3/4, piglit_height/2, blue)) { - result = PIGLIT_FAILURE; + result = PIGLIT_FAIL; } glutSwapBuffers(); diff --git a/tests/fbo/fbo-generatemipmap-array.c b/tests/fbo/fbo-generatemipmap-array.c index afea9f172..12c9e30f6 100644 --- a/tests/fbo/fbo-generatemipmap-array.c +++ b/tests/fbo/fbo-generatemipmap-array.c @@ -388,7 +388,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-generatemipmap-filtering.c b/tests/fbo/fbo-generatemipmap-filtering.c index c1c3c9038..9a4926780 100644 --- a/tests/fbo/fbo-generatemipmap-filtering.c +++ b/tests/fbo/fbo-generatemipmap-filtering.c @@ -128,7 +128,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-generatemipmap-formats.c b/tests/fbo/fbo-generatemipmap-formats.c index f19b2ac05..122d24c2b 100644 --- a/tests/fbo/fbo-generatemipmap-formats.c +++ b/tests/fbo/fbo-generatemipmap-formats.c @@ -452,7 +452,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-generatemipmap-nonsquare.c b/tests/fbo/fbo-generatemipmap-nonsquare.c index 454cd6fde..214c7fd41 100644 --- a/tests/fbo/fbo-generatemipmap-nonsquare.c +++ b/tests/fbo/fbo-generatemipmap-nonsquare.c @@ -164,7 +164,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-generatemipmap-npot.c b/tests/fbo/fbo-generatemipmap-npot.c index 15ae1d8bf..b70b47686 100644 --- a/tests/fbo/fbo-generatemipmap-npot.c +++ b/tests/fbo/fbo-generatemipmap-npot.c @@ -158,7 +158,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-generatemipmap-scissor.c b/tests/fbo/fbo-generatemipmap-scissor.c index 5fb5733a1..6e65b6dd0 100644 --- a/tests/fbo/fbo-generatemipmap-scissor.c +++ b/tests/fbo/fbo-generatemipmap-scissor.c @@ -164,7 +164,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-generatemipmap-viewport.c b/tests/fbo/fbo-generatemipmap-viewport.c index db8ae74ee..998aad362 100644 --- a/tests/fbo/fbo-generatemipmap-viewport.c +++ b/tests/fbo/fbo-generatemipmap-viewport.c @@ -154,7 +154,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-generatemipmap.c b/tests/fbo/fbo-generatemipmap.c index 00cf73a8a..c5513e45c 100644 --- a/tests/fbo/fbo-generatemipmap.c +++ b/tests/fbo/fbo-generatemipmap.c @@ -158,7 +158,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-getframebufferattachmentparameter-01.c b/tests/fbo/fbo-getframebufferattachmentparameter-01.c index 6221b31c1..551a03dac 100644 --- a/tests/fbo/fbo-getframebufferattachmentparameter-01.c +++ b/tests/fbo/fbo-getframebufferattachmentparameter-01.c @@ -37,7 +37,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; enum piglit_result piglit_display(void) { - return PIGLIT_FAILURE; + return PIGLIT_FAIL; } GLboolean @@ -102,13 +102,13 @@ piglit_init(int argc, char **argv) err = glGetError(); if (err != 0) { printf("Unexpected GL error state 0x%04x\n", err); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER); if (status != GL_FRAMEBUFFER_COMPLETE) { printf("FBO incomplete because 0x%04x\n", status); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } pass = try_GetAttachmentParam(GL_COLOR_ATTACHMENT0, @@ -152,5 +152,5 @@ piglit_init(int argc, char **argv) "") && pass; - piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE); + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } diff --git a/tests/fbo/fbo-incomplete-texture-01.c b/tests/fbo/fbo-incomplete-texture-01.c index cf424b7c7..496d1d5f9 100644 --- a/tests/fbo/fbo-incomplete-texture-01.c +++ b/tests/fbo/fbo-incomplete-texture-01.c @@ -42,7 +42,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; enum piglit_result piglit_display(void) { - return PIGLIT_FAILURE; + return PIGLIT_FAIL; } void @@ -78,14 +78,14 @@ piglit_init(int argc, char **argv) err = glGetError(); if (err != 0) { fprintf(stderr, "Unexpected GL error state 0x%04x\n", err); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } status = glCheckFramebufferStatus(GL_FRAMEBUFFER); if (status != GL_FRAMEBUFFER_COMPLETE) { fprintf(stderr, "FBO erroneously incomplete: 0x%04x\n", status); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } glClearColor(color[0], color[1], color[2], color[3]); @@ -94,14 +94,14 @@ piglit_init(int argc, char **argv) err = glGetError(); if (err != 0) { fprintf(stderr, "Unexpected GL error state 0x%04x\n", err); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } if (!piglit_probe_texel_rect_rgba(GL_TEXTURE_2D, 0, 0, 0, 32, 32, color)) { fprintf(stderr, "FBO clear didn't work\n"); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } - piglit_report_result(PIGLIT_SUCCESS); + piglit_report_result(PIGLIT_PASS); } diff --git a/tests/fbo/fbo-incomplete-texture-02.c b/tests/fbo/fbo-incomplete-texture-02.c index 6bd9fe88a..4871d4d3d 100644 --- a/tests/fbo/fbo-incomplete-texture-02.c +++ b/tests/fbo/fbo-incomplete-texture-02.c @@ -42,7 +42,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; enum piglit_result piglit_display(void) { - return PIGLIT_FAILURE; + return PIGLIT_FAIL; } void @@ -85,14 +85,14 @@ piglit_init(int argc, char **argv) err = glGetError(); if (err != 0) { fprintf(stderr, "Unexpected GL error state 0x%04x\n", err); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } status = glCheckFramebufferStatus(GL_FRAMEBUFFER); if (status != GL_FRAMEBUFFER_COMPLETE) { fprintf(stderr, "FBO erroneously incomplete: 0x%04x\n", status); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } glClearColor(color[0], color[1], color[2], color[3]); @@ -101,14 +101,14 @@ piglit_init(int argc, char **argv) err = glGetError(); if (err != 0) { fprintf(stderr, "Unexpected GL error state 0x%04x\n", err); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } if (!piglit_probe_texel_rect_rgba(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, 0, 0, 32, 32, color)) { fprintf(stderr, "FBO clear didn't work\n"); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } - piglit_report_result(PIGLIT_SUCCESS); + piglit_report_result(PIGLIT_PASS); } diff --git a/tests/fbo/fbo-incomplete-texture-03.c b/tests/fbo/fbo-incomplete-texture-03.c index 2b5eff98d..0b0bdef98 100644 --- a/tests/fbo/fbo-incomplete-texture-03.c +++ b/tests/fbo/fbo-incomplete-texture-03.c @@ -41,7 +41,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; enum piglit_result piglit_display(void) { - return PIGLIT_FAILURE; + return PIGLIT_FAIL; } void @@ -86,14 +86,14 @@ piglit_init(int argc, char **argv) err = glGetError(); if (err != 0) { fprintf(stderr, "Unexpected GL error state 0x%04x\n", err); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } status = glCheckFramebufferStatus(GL_FRAMEBUFFER); if (status != GL_FRAMEBUFFER_COMPLETE) { fprintf(stderr, "FBO erroneously incomplete: 0x%04x\n", status); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } glClearColor(color[0], color[1], color[2], color[3]); @@ -102,14 +102,14 @@ piglit_init(int argc, char **argv) err = glGetError(); if (err != 0) { fprintf(stderr, "Unexpected GL error state 0x%04x\n", err); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } if (!piglit_probe_texel_rect_rgba(GL_TEXTURE_CUBE_MAP_POSITIVE_X, 0, 0, 0, 32, 32, color)) { fprintf(stderr, "FBO clear didn't work\n"); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } - piglit_report_result(PIGLIT_SUCCESS); + piglit_report_result(PIGLIT_PASS); } diff --git a/tests/fbo/fbo-incomplete-texture-04.c b/tests/fbo/fbo-incomplete-texture-04.c index 0506f49cd..5640854cf 100644 --- a/tests/fbo/fbo-incomplete-texture-04.c +++ b/tests/fbo/fbo-incomplete-texture-04.c @@ -42,7 +42,7 @@ int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; enum piglit_result piglit_display(void) { - return PIGLIT_FAILURE; + return PIGLIT_FAIL; } void @@ -118,13 +118,13 @@ piglit_init(int argc, char **argv) err = glGetError(); if (err != 0) { fprintf(stderr, "Unexpected GL error state 0x%04x\n", err); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } if (!piglit_probe_texel_rect_rgba(GL_TEXTURE_2D, 2, 0, 0, 8, 8, color)) { fprintf(stderr, "FBO clear didn't work\n"); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } piglit_report_result(PIGLIT_PASS); diff --git a/tests/fbo/fbo-integer.c b/tests/fbo/fbo-integer.c index 44eaa9963..5ec59daca 100644 --- a/tests/fbo/fbo-integer.c +++ b/tests/fbo/fbo-integer.c @@ -382,9 +382,9 @@ piglit_display(void) for (f = 0; f < NUM_FORMATS; f++) { GLboolean pass = test_fbo(&Formats[f]); if (!pass) - return PIGLIT_FAILURE; + return PIGLIT_FAIL; } - return PIGLIT_SUCCESS; + return PIGLIT_PASS; } diff --git a/tests/fbo/fbo-luminance-alpha.c b/tests/fbo/fbo-luminance-alpha.c index 39ff04834..eebad3b7a 100644 --- a/tests/fbo/fbo-luminance-alpha.c +++ b/tests/fbo/fbo-luminance-alpha.c @@ -140,7 +140,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-maxsize.c b/tests/fbo/fbo-maxsize.c index 220525e9a..f8dc77092 100644 --- a/tests/fbo/fbo-maxsize.c +++ b/tests/fbo/fbo-maxsize.c @@ -206,7 +206,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-nodepth-test.c b/tests/fbo/fbo-nodepth-test.c index 5242494f5..d2d292531 100644 --- a/tests/fbo/fbo-nodepth-test.c +++ b/tests/fbo/fbo-nodepth-test.c @@ -88,7 +88,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-nostencil-test.c b/tests/fbo/fbo-nostencil-test.c index b5e0cfa71..46fc676ea 100644 --- a/tests/fbo/fbo-nostencil-test.c +++ b/tests/fbo/fbo-nostencil-test.c @@ -88,7 +88,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-pbo-readpixels-small.c b/tests/fbo/fbo-pbo-readpixels-small.c index 46c8ca59e..1903bbada 100644 --- a/tests/fbo/fbo-pbo-readpixels-small.c +++ b/tests/fbo/fbo-pbo-readpixels-small.c @@ -156,7 +156,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-readdrawpix.c b/tests/fbo/fbo-readdrawpix.c index 0787646e1..0e879c956 100644 --- a/tests/fbo/fbo-readdrawpix.c +++ b/tests/fbo/fbo-readdrawpix.c @@ -205,7 +205,7 @@ piglit_display(void) { GLboolean pass = run_test(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-readpixels.c b/tests/fbo/fbo-readpixels.c index 988f3dd6c..212bc9e87 100644 --- a/tests/fbo/fbo-readpixels.c +++ b/tests/fbo/fbo-readpixels.c @@ -194,7 +194,7 @@ piglit_display(void) 0, (BUF_HEIGHT + 1) * 3); glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-rg.c b/tests/fbo/fbo-rg.c index bf3b677b3..ec2a151ad 100644 --- a/tests/fbo/fbo-rg.c +++ b/tests/fbo/fbo-rg.c @@ -88,7 +88,7 @@ piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } static int @@ -125,7 +125,7 @@ create_fbo(unsigned width, unsigned height, GLenum internal_format) glDeleteFramebuffersEXT(1, &fb); glDeleteTextures(1, &tex); piglit_report_result((status == GL_FRAMEBUFFER_UNSUPPORTED_EXT) - ? PIGLIT_SKIP : PIGLIT_FAILURE); + ? PIGLIT_SKIP : PIGLIT_FAIL); } return fb; @@ -310,7 +310,7 @@ render_and_check_textures(GLenum internal_format) break; default: fprintf(stderr, "invalid format 0x%04x\n", internal_format); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); break; } @@ -330,20 +330,20 @@ render_and_check_textures(GLenum internal_format) glBindAttribLocation(fbo_program, 1, "color"); glLinkProgram(fbo_program); if (!piglit_link_check_status(fbo_program)) - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); scale_loc = glGetUniformLocation(fbo_program, "scale"); if (scale_loc < 0) { fprintf(stderr, "couldn't get uniform location for \"scale\"\n"); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } bias_loc = glGetUniformLocation(fbo_program, "bias"); if (bias_loc < 0) { fprintf(stderr, "couldn't get uniform location for \"bias\"\n"); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } glUseProgram(fbo_program); @@ -396,7 +396,7 @@ usage(const char *name) "where internal_format is one of GL_RED, GL_R8, GL_RG, " "GL_RG8, etc.\n", name); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } void @@ -478,5 +478,5 @@ piglit_init(int argc, char **argv) pass = render_and_check_textures(internal_format); if (piglit_automatic) - piglit_report_result(pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE); + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL); } diff --git a/tests/fbo/fbo-scissor-bitmap.c b/tests/fbo/fbo-scissor-bitmap.c index f628d2e7f..baf0e4186 100644 --- a/tests/fbo/fbo-scissor-bitmap.c +++ b/tests/fbo/fbo-scissor-bitmap.c @@ -176,7 +176,7 @@ draw_and_test(const char *destination, int drawable_width, int drawable_height) error = glGetError(); if (error) { fprintf(stderr, "glClear error: 0x%x\n", error); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } glColor4fv(red); @@ -376,7 +376,7 @@ piglit_display() glDeleteTextures(1, &texture); glDeleteFramebuffersEXT(1, &fbo); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void diff --git a/tests/fbo/fbo-srgb-blit.c b/tests/fbo/fbo-srgb-blit.c index ea393d329..fc8d4e145 100644 --- a/tests/fbo/fbo-srgb-blit.c +++ b/tests/fbo/fbo-srgb-blit.c @@ -115,7 +115,7 @@ enum piglit_result piglit_display(void) glutSwapBuffers(); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) diff --git a/tests/fbo/fbo-srgb.c b/tests/fbo/fbo-srgb.c index 407e2ff4a..3b6607f48 100644 --- a/tests/fbo/fbo-srgb.c +++ b/tests/fbo/fbo-srgb.c @@ -177,7 +177,7 @@ piglit_display(void) } else printf("Failed on format SRGB8_ALPHA8\n"); - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-storage-completeness.c b/tests/fbo/fbo-storage-completeness.c index ecb41a99b..f8d4adbb0 100644 --- a/tests/fbo/fbo-storage-completeness.c +++ b/tests/fbo/fbo-storage-completeness.c @@ -48,7 +48,7 @@ check_error(int line) if (err) { printf("%s: Unexpected error 0x%x at line %d\n", TestName, err, line); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } } diff --git a/tests/fbo/fbo-storage-formats.c b/tests/fbo/fbo-storage-formats.c index 57d241c26..70c1d84c5 100644 --- a/tests/fbo/fbo-storage-formats.c +++ b/tests/fbo/fbo-storage-formats.c @@ -47,7 +47,7 @@ check_error(int line) if (err) { printf("%s: Unexpected error 0x%x at line %d\n", TestName, err, line); - piglit_report_result(PIGLIT_FAILURE); + piglit_report_result(PIGLIT_FAIL); } } @@ -228,7 +228,7 @@ test(void) } } - return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; } diff --git a/tests/fbo/fbo-sys-blit.c b/tests/fbo/fbo-sys-blit.c index e0aa4399b..9973ef295 100644 --- a/tests/fbo/fbo-sys-blit.c +++ b/tests/fbo/fbo-sys-blit.c @@ -53,7 +53,7 @@ enum piglit_result piglit_display(void) glFinish(); glReadBuffer(GL_FRONT); - return piglit_probe_pixel_rgb(w / 2, h / 2, expected) ? PIGLIT_SUCCESS : PIGLIT_FAILURE; + return piglit_probe_pixel_rgb(w / 2, h / 2, expected) ? PIGLIT_PASS : PIGLIT_FAIL; } void piglit_init(int argc, char **argv) |