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>

24 files changed, 96 insertions, 72 deletions

diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s0.c b/tests/hiz/hiz-depth-read-fbo-d24-s0.c
index a030d55a..05b8c912 100644
--- a/tests/hiz/hiz-depth-read-fbo-d24-s0.c
+++ b/tests/hiz/hiz-depth-read-fbo-d24-s0.c
@@ -33,9 +33,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s8.c b/tests/hiz/hiz-depth-read-fbo-d24-s8.c
index 5d250724..b3b2c97d 100644
--- a/tests/hiz/hiz-depth-read-fbo-d24-s8.c
+++ b/tests/hiz/hiz-depth-read-fbo-d24-s8.c
@@ -34,9 +34,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-read-fbo-d24s8.c b/tests/hiz/hiz-depth-read-fbo-d24s8.c
index f4103873..fea0494f 100644
--- a/tests/hiz/hiz-depth-read-fbo-d24s8.c
+++ b/tests/hiz/hiz-depth-read-fbo-d24s8.c
@@ -33,9 +33,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-read-window-stencil0.c b/tests/hiz/hiz-depth-read-window-stencil0.c
index c1adc845..a3d9ed20 100644
--- a/tests/hiz/hiz-depth-read-window-stencil0.c
+++ b/tests/hiz/hiz-depth-read-window-stencil0.c
@@ -31,9 +31,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/hiz/hiz-depth-read-window-stencil1.c b/tests/hiz/hiz-depth-read-window-stencil1.c
index 2ba43380..f8cdc912 100644
--- a/tests/hiz/hiz-depth-read-window-stencil1.c
+++ b/tests/hiz/hiz-depth-read-window-stencil1.c
@@ -31,9 +31,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c
index b980e031..0834f6b4 100644
--- a/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c
+++ b/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c
@@ -41,9 +41,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c
index dae48e9b..1ebe606c 100644
--- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c
+++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c
@@ -41,9 +41,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c
index 9dd74bb6..b972c7cd 100644
--- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c
+++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c
@@ -42,9 +42,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c
index cc6f1333..e150a0a0 100644
--- a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c
+++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c
@@ -41,9 +41,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s0.c b/tests/hiz/hiz-depth-test-fbo-d24-s0.c
index bd163344..d5f5f7b6 100644
--- a/tests/hiz/hiz-depth-test-fbo-d24-s0.c
+++ b/tests/hiz/hiz-depth-test-fbo-d24-s0.c
@@ -38,9 +38,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s8.c b/tests/hiz/hiz-depth-test-fbo-d24-s8.c
index 8d7fc650..384d0749 100644
--- a/tests/hiz/hiz-depth-test-fbo-d24-s8.c
+++ b/tests/hiz/hiz-depth-test-fbo-d24-s8.c
@@ -39,9 +39,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-test-fbo-d24s8.c b/tests/hiz/hiz-depth-test-fbo-d24s8.c
index 53ca958e..5b4138e2 100644
--- a/tests/hiz/hiz-depth-test-fbo-d24s8.c
+++ b/tests/hiz/hiz-depth-test-fbo-d24s8.c
@@ -38,9 +38,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-depth-test-window-stencil0.c b/tests/hiz/hiz-depth-test-window-stencil0.c
index 2c18be30..cef4d0d4 100644
--- a/tests/hiz/hiz-depth-test-window-stencil0.c
+++ b/tests/hiz/hiz-depth-test-window-stencil0.c
@@ -35,9 +35,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/hiz/hiz-depth-test-window-stencil1.c b/tests/hiz/hiz-depth-test-window-stencil1.c
index 88a5a1d6..eae0d112 100644
--- a/tests/hiz/hiz-depth-test-window-stencil1.c
+++ b/tests/hiz/hiz-depth-test-window-stencil1.c
@@ -35,9 +35,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c
index 20a14364..90d86ac7 100644
--- a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c
+++ b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c
@@ -39,9 +39,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c
index fdee0657..f53ad7e4 100644
--- a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c
+++ b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c
@@ -40,9 +40,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-stencil-read-fbo-d24s8.c b/tests/hiz/hiz-stencil-read-fbo-d24s8.c
index 19d94923..967763ec 100644
--- a/tests/hiz/hiz-stencil-read-fbo-d24s8.c
+++ b/tests/hiz/hiz-stencil-read-fbo-d24s8.c
@@ -39,9 +39,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-stencil-read-window-depth0.c b/tests/hiz/hiz-stencil-read-window-depth0.c
index b4e21b21..44a4d899 100644
--- a/tests/hiz/hiz-stencil-read-window-depth0.c
+++ b/tests/hiz/hiz-stencil-read-window-depth0.c
@@ -37,9 +37,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/hiz/hiz-stencil-read-window-depth1.c b/tests/hiz/hiz-stencil-read-window-depth1.c
index c2650fc8..c3e9c04c 100644
--- a/tests/hiz/hiz-stencil-read-window-depth1.c
+++ b/tests/hiz/hiz-stencil-read-window-depth1.c
@@ -37,9 +37,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL | GLUT_DEPTH)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c
index 1deade33..1e84966a 100644
--- a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c
+++ b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c
@@ -38,9 +38,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c
index 1767ab77..50cefbad 100644
--- a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c
+++ b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c
@@ -39,9 +39,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-stencil-test-fbo-d24s8.c
index 09a30078..b5f8c196 100644
--- a/tests/hiz/hiz-stencil-test-fbo-d24s8.c
+++ b/tests/hiz/hiz-stencil-test-fbo-d24s8.c
@@ -38,9 +38,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB)
 
 struct hiz_fbo_options fbo_options = {
 	GL_RGBA,
diff --git a/tests/hiz/hiz-stencil-test-window-depth0.c b/tests/hiz/hiz-stencil-test-window-depth0.c
index 9555af58..6189ef9c 100644
--- a/tests/hiz/hiz-stencil-test-window-depth0.c
+++ b/tests/hiz/hiz-stencil-test-window-depth0.c
@@ -35,9 +35,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL)
 
 void
 piglit_init(int argc, char **argv)
diff --git a/tests/hiz/hiz-stencil-test-window-depth1.c b/tests/hiz/hiz-stencil-test-window-depth1.c
index d04e1367..05561a0b 100644
--- a/tests/hiz/hiz-stencil-test-window-depth1.c
+++ b/tests/hiz/hiz-stencil-test-window-depth1.c
@@ -35,9 +35,10 @@
 #include "piglit-util.h"
 #include "hiz/hiz-util.h"
 
-int piglit_width = 400;
-int piglit_height = 400;
-int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL | GLUT_DEPTH;
+PIGLIT_GL_TEST_MAIN(
+    400 /*window_width*/,
+    400 /*window_height*/,
+    GLUT_RGB | GLUT_ALPHA | GLUT_STENCIL | GLUT_DEPTH)
 
 void
 piglit_init(int argc, char **argv)