tests: Let each test define main()

Each test that did not define main() now does so using
PIGLIT_GL_TEST_MAIN().

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

20 files changed, 82 insertions, 53 deletions

diff --git a/tests/bugs/crash-cubemap-order.c b/tests/bugs/crash-cubemap-order.c
index d8a59d2c..2d07fc05 100644
--- a/tests/bugs/crash-cubemap-order.c
+++ b/tests/bugs/crash-cubemap-order.c
@@ -8,8 +8,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGBA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/bugs/crash-texparameter-before-teximage.c b/tests/bugs/crash-texparameter-before-teximage.c
index 485f2af2..581cb1b5 100644
--- a/tests/bugs/crash-texparameter-before-teximage.c
+++ b/tests/bugs/crash-texparameter-before-teximage.c
@@ -9,9 +9,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGBA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/bugs/drawbuffer-modes.c b/tests/bugs/drawbuffer-modes.c
index 24078273..94ee90d7 100644
--- a/tests/bugs/drawbuffer-modes.c
+++ b/tests/bugs/drawbuffer-modes.c
@@ -35,8 +35,11 @@
  * \Author Yi Sun <yi.sun@intel.com>, Anuj Phogat <anuj.phogat@gmail.com>
  */
 #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)
 
 float color[7][4] = {
 	{ 0.1, 0.2, 0.3, 1.0 },
diff --git a/tests/bugs/fdo10370.c b/tests/bugs/fdo10370.c
index 47053571..996c0ee1 100644
--- a/tests/bugs/fdo10370.c
+++ b/tests/bugs/fdo10370.c
@@ -5,8 +5,11 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 128, piglit_height = 128;
-int piglit_window_mode = GLUT_SINGLE | GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_SINGLE | GLUT_RGB)
+
 #define BITMAP_WIDTH 1
 #define BITMAP_HEIGHT 1
 #define ALIGN 1
diff --git a/tests/bugs/fdo14575.c b/tests/bugs/fdo14575.c
index 4a7942a5..09d0f512 100644
--- a/tests/bugs/fdo14575.c
+++ b/tests/bugs/fdo14575.c
@@ -32,8 +32,10 @@
  */
 #include "piglit-util.h"
 
-int piglit_width = 128, piglit_height = 128;
-int piglit_window_mode = GLUT_SINGLE | GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_SINGLE | GLUT_RGB)
 
 void
 piglit_init(int argc, char**argv)
diff --git a/tests/bugs/fdo20701.c b/tests/bugs/fdo20701.c
index 84201819..a00fb149 100644
--- a/tests/bugs/fdo20701.c
+++ b/tests/bugs/fdo20701.c
@@ -36,8 +36,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 128, piglit_height = 128;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    128 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_RGB)
 
 static GLuint fb;
 static GLuint tex;
diff --git a/tests/bugs/fdo22540.c b/tests/bugs/fdo22540.c
index 5ed7b01c..f2cd24ec 100644
--- a/tests/bugs/fdo22540.c
+++ b/tests/bugs/fdo22540.c
@@ -25,8 +25,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 400, piglit_height = 300;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    300 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB)
 
 static GLuint vBuffer;
 
diff --git a/tests/bugs/fdo23489.c b/tests/bugs/fdo23489.c
index 8269d1a7..afdfb476 100644
--- a/tests/bugs/fdo23489.c
+++ b/tests/bugs/fdo23489.c
@@ -5,8 +5,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 250, piglit_height = 250;
-int piglit_window_mode = GLUT_SINGLE | GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    250 /*window_width*/,
+    250 /*window_height*/,
+    GLUT_SINGLE | GLUT_RGB)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/bugs/fdo23670-depth_test.c b/tests/bugs/fdo23670-depth_test.c
index 685d4992..bef9d71c 100644
--- a/tests/bugs/fdo23670-depth_test.c
+++ b/tests/bugs/fdo23670-depth_test.c
@@ -26,9 +26,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100;
-int piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/bugs/fdo23670-drawpix_stencil.c b/tests/bugs/fdo23670-drawpix_stencil.c
index ab16e4c5..20722337 100644
--- a/tests/bugs/fdo23670-drawpix_stencil.c
+++ b/tests/bugs/fdo23670-drawpix_stencil.c
@@ -26,9 +26,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100;
-int piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/bugs/fdo24066.c b/tests/bugs/fdo24066.c
index 07aacf80..5308a9ce 100644
--- a/tests/bugs/fdo24066.c
+++ b/tests/bugs/fdo24066.c
@@ -35,10 +35,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_window_mode = GLUT_RGBA;
-int piglit_width = 16;
-int piglit_height = 16;
-
+PIGLIT_GL_TEST_MAIN(
+    16 /*window_width*/,
+    16 /*window_height*/,
+    GLUT_RGBA)
 
 enum piglit_result piglit_display(void)
 {
diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c
index aaaa3f96..15f208d2 100644
--- a/tests/bugs/fdo25614-genmipmap.c
+++ b/tests/bugs/fdo25614-genmipmap.c
@@ -40,9 +40,10 @@
 #define TEST_COLS 5
 #define BOX_SIZE  (1 << (TEST_COLS + 1))
 
-int piglit_width = (BOX_SIZE + 2) * TEST_COLS + 1;
-int piglit_height = (BOX_SIZE + 1) + 1;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    (BOX_SIZE + 2) * TEST_COLS + 1 /*window_width*/,
+    (BOX_SIZE + 1) + 1 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static GLuint tex[1];
 
diff --git a/tests/bugs/fdo28551.c b/tests/bugs/fdo28551.c
index 3a0de62e..cf4ea8e1 100644
--- a/tests/bugs/fdo28551.c
+++ b/tests/bugs/fdo28551.c
@@ -26,10 +26,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 100;
-int piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_STENCIL)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/bugs/fdo31934.c b/tests/bugs/fdo31934.c
index 1400d478..644d6e1e 100644
--- a/tests/bugs/fdo31934.c
+++ b/tests/bugs/fdo31934.c
@@ -1,7 +1,9 @@
 #include "piglit-util.h"
 
-int piglit_width = 512, piglit_height = 512;
-int piglit_window_mode = GLUT_RGBA;
+PIGLIT_GL_TEST_MAIN(
+    512 /*window_width*/,
+    512 /*window_height*/,
+    GLUT_RGBA)
 
 void
 piglit_init(int argc, char *argv[])
diff --git a/tests/bugs/fdo9833.c b/tests/bugs/fdo9833.c
index eade55e6..5f5a7dcf 100644
--- a/tests/bugs/fdo9833.c
+++ b/tests/bugs/fdo9833.c
@@ -5,8 +5,10 @@
 
 #include "piglit-util.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGBA)
 
 enum piglit_result
 piglit_display(void)
diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c
index 574b07dd..f7e27f66 100644
--- a/tests/bugs/point-sprite.c
+++ b/tests/bugs/point-sprite.c
@@ -35,9 +35,10 @@
 #define TEST_COLS 6
 #define TEST_ROWS 2
 
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB;
-int piglit_width = 1 + ((BOX_SIZE + 1) * TEST_COLS);
-int piglit_height = 1 + ((BOX_SIZE + 1) * TEST_ROWS);
+PIGLIT_GL_TEST_MAIN(
+    1 + ((BOX_SIZE + 1) * TEST_COLS) /*window_width*/,
+    1 + ((BOX_SIZE + 1) * TEST_ROWS) /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB)
 
 static float maxSize = 0.0f;
 static GLuint tex;
diff --git a/tests/bugs/r300-readcache.c b/tests/bugs/r300-readcache.c
index e7587fa5..24db1d38 100644
--- a/tests/bugs/r300-readcache.c
+++ b/tests/bugs/r300-readcache.c
@@ -18,8 +18,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 100, piglit_height = 100;
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA;
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGBA)
 
 static GLfloat colors[8][3] = {
 	{ 1.0, 1.0, 1.0 },
diff --git a/tests/bugs/tex1d-2dborder.c b/tests/bugs/tex1d-2dborder.c
index 881ab470..dc294ea5 100644
--- a/tests/bugs/tex1d-2dborder.c
+++ b/tests/bugs/tex1d-2dborder.c
@@ -33,8 +33,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-int piglit_width = 256, piglit_height = 128;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
+PIGLIT_GL_TEST_MAIN(
+    256 /*window_width*/,
+    128 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static const GLfloat TextureColor[3] = { 1.0, 0.5, 0.0 };
 
diff --git a/tests/bugs/tri-tex-crash.c b/tests/bugs/tri-tex-crash.c
index e36c447e..36bbca2e 100644
--- a/tests/bugs/tri-tex-crash.c
+++ b/tests/bugs/tri-tex-crash.c
@@ -30,10 +30,10 @@
 
 #include "piglit-util.h"
 
-
-int piglit_width = 400, piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_DOUBLE;
-
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_DOUBLE)
 
 static void
 make_texture(void)
diff --git a/tests/bugs/vbo-buffer-unmap.c b/tests/bugs/vbo-buffer-unmap.c
index 021a75ee..d19d8c48 100644
--- a/tests/bugs/vbo-buffer-unmap.c
+++ b/tests/bugs/vbo-buffer-unmap.c
@@ -33,10 +33,10 @@
 #include "piglit-util.h"
 #include "piglit-framework.h"
 
-
-int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB;
-int piglit_width = 100, piglit_height = 100;
-
+PIGLIT_GL_TEST_MAIN(
+    100 /*window_width*/,
+    100 /*window_height*/,
+    GLUT_DOUBLE | GLUT_RGB)
 
 enum piglit_result
 piglit_display(void)