diff options
Diffstat (limited to 'tests/spec/gl-3.0/api')
8 files changed, 31 insertions, 17 deletions
diff --git a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c index ce5fec80c..37e81e7d8 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c +++ b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c @@ -29,8 +29,10 @@ */ #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/spec/gl-3.0/api/bindfragdata-link-error.c b/tests/spec/gl-3.0/api/bindfragdata-link-error.c index 976f7ebdc..cdf67f3f9 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-link-error.c +++ b/tests/spec/gl-3.0/api/bindfragdata-link-error.c @@ -27,8 +27,10 @@ */ #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE) static const char *vs_text = "#version 130\n" diff --git a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c index 36378602d..f8242cb91 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c +++ b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c @@ -28,8 +28,10 @@ */ #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE) static const char *vs_text = "#version 130\n" diff --git a/tests/spec/gl-3.0/api/clearbuffer-common.c b/tests/spec/gl-3.0/api/clearbuffer-common.c index f675f1fa3..f421b6356 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-common.c +++ b/tests/spec/gl-3.0/api/clearbuffer-common.c @@ -30,8 +30,10 @@ const float default_color[4] = { 0.2, 0.4, 0.6, 1.0 }; const float default_depth = 0.2; const int default_stencil = 0x7a; -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE) GLuint generate_simple_fbo(bool color, bool stencil, bool depth, bool packed) diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c index 614989362..3a6b4a6d5 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c @@ -28,8 +28,10 @@ */ #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE) /* These enums don't really exist, but they were accidentally shipped in some * versions of glext.h. diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c index d4c9ac8ac..2a915c143 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c @@ -29,8 +29,10 @@ */ #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE) enum piglit_result piglit_display(void) diff --git a/tests/spec/gl-3.0/api/getfragdatalocation.c b/tests/spec/gl-3.0/api/getfragdatalocation.c index 5bb2d4bda..25897f596 100644 --- a/tests/spec/gl-3.0/api/getfragdatalocation.c +++ b/tests/spec/gl-3.0/api/getfragdatalocation.c @@ -27,8 +27,10 @@ */ #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE; +PIGLIT_GL_TEST_MAIN( + 100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_DOUBLE) static const char *vs_text = "#version 130\n" diff --git a/tests/spec/gl-3.0/api/integer-errors.c b/tests/spec/gl-3.0/api/integer-errors.c index 2587ef40e..f26e59287 100644 --- a/tests/spec/gl-3.0/api/integer-errors.c +++ b/tests/spec/gl-3.0/api/integer-errors.c @@ -30,9 +30,9 @@ #include "piglit-util.h" -int piglit_width = 100, piglit_height = 100; -int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE; - +PIGLIT_GL_TEST_MAIN(100 /*window_width*/, + 100 /*window_height*/, + GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE); static bool test_api_errors(void) |