Re: [Piglit] [PATCH 2/2] glean: remove pointless switch statements from fbo test

2017-08-17 Thread Eric Anholt
Brian Paul  writes:

> All switch cases did the same thing.  Spotted by Eric Anholt.

Reviewed-by: Eric Anholt 


signature.asc
Description: PGP signature
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit


Re: [Piglit] [PATCH] glx: Fix glx-swap-exchange v2

2017-08-17 Thread Brian Paul

On 08/17/2017 02:21 AM, Thomas Hellstrom wrote:

Fix the following problems with this test:

1) The spec is not referring to glXChooseVisual attributes, only to
glXChooseFBConfig attributes. So use glXChooseFBConfig.

2) Make sure we have an alpha channel.

3) Call piglit_dispatch_default_init before issuing GL commands.

v2:
- Test also alpha.
- Test also frontbuffer.

Signed-off-by: Thomas Hellstrom 
---
  tests/glx/glx-swap-exchange.c | 74 +++
  1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/tests/glx/glx-swap-exchange.c b/tests/glx/glx-swap-exchange.c
index 3f045f8..1f8b6c5 100644
--- a/tests/glx/glx-swap-exchange.c
+++ b/tests/glx/glx-swap-exchange.c
@@ -1,5 +1,6 @@
  /*
   * Copyright © 2010 Intel Corporation
+ * Copyright © 2010 VMWare Inc.


2017?



   *
   * Permission is hereby granted, free of charge, to any person obtaining a
   * copy of this software and associated documentation files (the "Software"),
@@ -22,6 +23,7 @@
   *
   * Authors:
   *Eric Anholt 
+ *Thomas Hellstrom 
   *
   */

@@ -36,60 +38,63 @@

  int piglit_width = 50, piglit_height = 50;
  static Display *dpy;
-static Window win;
-static XVisualInfo *visinfo;
+static GLXFBConfig *config;
+static GLXContext ctx;
+static GLXWindow gwin;

  enum piglit_result
  draw(Display *dpy)
  {
GLboolean pass = GL_TRUE;
-   float green[] = {0.0, 1.0, 0.0, 0.0};
-   GLXContext ctx;
+   static const float green[] = {0.0, 1.0, 0.0, 0.3};
+   static const float red[] = {1.0, 0.0, 0.0, 0.5};

-   ctx = piglit_get_glx_context(dpy, visinfo);
-   glXMakeCurrent(dpy, win, ctx);
-
-   /* Clear background to gray */
-   glClearColor(0.0, 1.0, 0.0, 0.0);
+   glXMakeContextCurrent(dpy, gwin, gwin, ctx);
+   glClearColor(0.0, 1.0, 0.0, 0.3);
+   glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);


I don't think the glColorMask call is needed.

Looks good otherwise.

Reviewed-by: Brian Paul 


glClear(GL_COLOR_BUFFER_BIT);
-   glXSwapBuffers(dpy, win);
-   glClearColor(1.0, 0.0, 0.0, 0.0);
+   glXSwapBuffers(dpy, gwin);
+   glClearColor(1.0, 0.0, 0.0, 0.5);
glClear(GL_COLOR_BUFFER_BIT);
-   glXSwapBuffers(dpy, win);
-
+   glXSwapBuffers(dpy, gwin);
+   glReadBuffer(GL_BACK);
pass = piglit_probe_pixel_rgba(0, 0, green);
-
-   glXSwapBuffers(dpy, win);
+   if (pass) {
+   glReadBuffer(GL_FRONT);
+   pass = piglit_probe_pixel_rgba(0, 0, red);
+   }

return pass ? PIGLIT_PASS : PIGLIT_FAIL;
  }


-XVisualInfo *
-piglit_get_swap_exchange_visual(Display *dpy)
+static GLXFBConfig *
+piglit_get_swap_exchange_config(Display *dpy)
  {
-   XVisualInfo *visinfo;
+   GLXFBConfig *fbc;
+   int nele;
int attrib[] = {
-   GLX_RGBA,
-   GLX_RED_SIZE, 1,
-   GLX_GREEN_SIZE, 1,
-   GLX_BLUE_SIZE, 1,
-   GLX_DOUBLEBUFFER,
+   GLX_RENDER_TYPE, GLX_RGBA_BIT,
+   GLX_RED_SIZE, 8,
+   GLX_GREEN_SIZE, 8,
+   GLX_BLUE_SIZE, 8,
+   GLX_ALPHA_SIZE, 8,
GLX_SWAP_METHOD_OML, GLX_SWAP_EXCHANGE_OML,
+   GLX_DOUBLEBUFFER, True,
None
};
int screen = DefaultScreen(dpy);

-   visinfo = glXChooseVisual(dpy, screen, attrib);
-   if (visinfo == NULL) {
+   fbc = glXChooseFBConfig(dpy, screen, attrib, );
+   if (fbc == NULL) {
fprintf(stderr,
"Couldn't get a GLX_SWAP_EXCHANGE_OML, RGBA, "
-   "double-buffered visual\n");
+   "double-buffered fbconfig\n");
piglit_report_result(PIGLIT_SKIP);
exit(1);
}

-   return visinfo;
+   return fbc;
  }

  int
@@ -97,6 +102,8 @@ main(int argc, char **argv)
  {
int i;
const char *glx_extension_list;
+   Window win;
+   XVisualInfo *visinfo;

for(i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "-auto"))
@@ -117,10 +124,21 @@ main(int argc, char **argv)
piglit_report_result(PIGLIT_SKIP);
}

-   visinfo = piglit_get_swap_exchange_visual(dpy);
+   config = piglit_get_swap_exchange_config(dpy);
+   visinfo = glXGetVisualFromFBConfig(dpy, config[0]);
+   if (!visinfo) {
+   printf("Error: couldn't create a visual from fbconfig.\n");
+   piglit_report_result(PIGLIT_FAIL);
+   }
+
win = piglit_get_glx_window(dpy, visinfo);
+   XFree(visinfo);

XMapWindow(dpy, win);
+   gwin = glXCreateWindow(dpy, config[0], win, NULL);
+   ctx = glXCreateNewContext(dpy, config[0], GLX_RGBA_TYPE, 0, GL_TRUE);
+   glXMakeContextCurrent(dpy, gwin, gwin, ctx);
+   piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);

 

Re: [Piglit] [PATCH] glx: Introduce a glx-swap-copy test

2017-08-17 Thread Brian Paul

On 08/17/2017 02:21 AM, Thomas Hellstrom wrote:

Tests the GLX_SWAP_COPY_OML swapbuffer mode. Very similar to the
glx-swap-exchange test.

Signed-off-by: Thomas Hellstrom 
---
  tests/glx/CMakeLists.gl.txt |   1 +
  tests/glx/glx-swap-copy.c   | 143 
  2 files changed, 144 insertions(+)
  create mode 100644 tests/glx/glx-swap-copy.c

diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
index 1e1c684..575e99b 100644
--- a/tests/glx/CMakeLists.gl.txt
+++ b/tests/glx/CMakeLists.gl.txt
@@ -52,6 +52,7 @@ IF(PIGLIT_BUILD_GLX_TESTS)
piglit_add_executable (glx-swap-event glx-swap-event.c)
piglit_add_executable (glx-make-glxdrawable-current 
glx-make-glxdrawable-current.c)
piglit_add_executable (glx-swap-exchange glx-swap-exchange.c)
+   piglit_add_executable (glx-swap-copy glx-swap-copy.c)
piglit_add_executable (glx-swap-pixmap glx-swap-pixmap.c)
piglit_add_executable (glx-swap-pixmap-bad glx-swap-pixmap-bad.c)
piglit_add_executable (glx-swap-singlebuffer glx-swap-singlebuffer.c)
diff --git a/tests/glx/glx-swap-copy.c b/tests/glx/glx-swap-copy.c
new file mode 100644
index 000..3bb1791
--- /dev/null
+++ b/tests/glx/glx-swap-copy.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2010 Intel Corporation
+ * Copyright © 2010 VMWare Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *Eric Anholt 
+ *Thomas Hellstrom 
+ *
+ */
+
+/** @file glx-swap-copy.c
+ *
+ * Test that GLX_SWAP_COPY_OML does in fact cause the back buffer to get
+ * preserved on swap.
+ */
+
+#include "piglit-util-gl.h"
+#include "piglit-glx-util.h"
+
+int piglit_width = 50, piglit_height = 50;
+static Display *dpy;
+static XVisualInfo *visinfo;
+static GLXFBConfig *config;
+static GLXContext ctx;
+static GLXWindow gwin;
+
+enum piglit_result
+draw(Display *dpy)
+{
+   GLboolean pass = GL_TRUE;
+   static const float red[] = {1.0, 0.0, 0.0, 0.5};
+
+   glXMakeContextCurrent(dpy, gwin, gwin, ctx);
+   glClearColor(1.0, 0.0, 0.0, 0.5);
+   glClear(GL_COLOR_BUFFER_BIT);
+   glXMakeContextCurrent(dpy, None, None, NULL);
+   glXSwapBuffers(dpy, gwin);
+   glXSwapBuffers(dpy, gwin);
+   glXSwapBuffers(dpy, gwin);
+   glXMakeContextCurrent(dpy, gwin, gwin, ctx);
+   glReadBuffer(GL_BACK);
+   pass = piglit_probe_pixel_rgba(0, 0, red);
+   if (pass) {
+   glReadBuffer(GL_FRONT);
+   pass = piglit_probe_pixel_rgb(0, 0, red);
+   }
+
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+
+static GLXFBConfig *
+piglit_get_swap_copy_config(Display *dpy)
+{
+   GLXFBConfig *fbc;
+   int nele;
+   int attrib[] = {
+   GLX_RENDER_TYPE, GLX_RGBA_BIT,
+   GLX_RED_SIZE, 8,
+   GLX_GREEN_SIZE, 8,
+   GLX_BLUE_SIZE, 8,
+   GLX_ALPHA_SIZE, 8,
+   GLX_SWAP_METHOD_OML, GLX_SWAP_COPY_OML,
+   GLX_DOUBLEBUFFER, True,
+   None
+   };
+   int screen = DefaultScreen(dpy);
+
+   fbc = glXChooseFBConfig(dpy, screen, attrib, );
+   if (fbc == NULL) {
+   fprintf(stderr,
+   "Couldn't get a GLX_SWAP_COPY_OML, RGBA, "
+   "double-buffered fbconfig\n");
+   piglit_report_result(PIGLIT_SKIP);
+   exit(1);
+   }
+
+   return fbc;
+}
+
+int
+main(int argc, char **argv)
+{
+   int i;
+   const char *glx_extension_list;
+   static Window win;


Why static?



+
+   for(i = 1; i < argc; ++i) {


"for ("



+   if (!strcmp(argv[i], "-auto"))
+   piglit_automatic = 1;
+   else
+   fprintf(stderr, "Unknown option: %s\n", argv[i]);
+   }
+
+   dpy = 

[Piglit] [PATCH] glx: Fix glx-swap-exchange v2

2017-08-17 Thread Thomas Hellstrom
Fix the following problems with this test:

1) The spec is not referring to glXChooseVisual attributes, only to
glXChooseFBConfig attributes. So use glXChooseFBConfig.

2) Make sure we have an alpha channel.

3) Call piglit_dispatch_default_init before issuing GL commands.

v2:
- Test also alpha.
- Test also frontbuffer.

Signed-off-by: Thomas Hellstrom 
---
 tests/glx/glx-swap-exchange.c | 74 +++
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/tests/glx/glx-swap-exchange.c b/tests/glx/glx-swap-exchange.c
index 3f045f8..1f8b6c5 100644
--- a/tests/glx/glx-swap-exchange.c
+++ b/tests/glx/glx-swap-exchange.c
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2010 Intel Corporation
+ * Copyright © 2010 VMWare Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,6 +23,7 @@
  *
  * Authors:
  *Eric Anholt 
+ *Thomas Hellstrom 
  *
  */
 
@@ -36,60 +38,63 @@
 
 int piglit_width = 50, piglit_height = 50;
 static Display *dpy;
-static Window win;
-static XVisualInfo *visinfo;
+static GLXFBConfig *config;
+static GLXContext ctx;
+static GLXWindow gwin;
 
 enum piglit_result
 draw(Display *dpy)
 {
GLboolean pass = GL_TRUE;
-   float green[] = {0.0, 1.0, 0.0, 0.0};
-   GLXContext ctx;
+   static const float green[] = {0.0, 1.0, 0.0, 0.3};
+   static const float red[] = {1.0, 0.0, 0.0, 0.5};
 
-   ctx = piglit_get_glx_context(dpy, visinfo);
-   glXMakeCurrent(dpy, win, ctx);
-
-   /* Clear background to gray */
-   glClearColor(0.0, 1.0, 0.0, 0.0);
+   glXMakeContextCurrent(dpy, gwin, gwin, ctx);
+   glClearColor(0.0, 1.0, 0.0, 0.3);
+   glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
glClear(GL_COLOR_BUFFER_BIT);
-   glXSwapBuffers(dpy, win);
-   glClearColor(1.0, 0.0, 0.0, 0.0);
+   glXSwapBuffers(dpy, gwin);
+   glClearColor(1.0, 0.0, 0.0, 0.5);
glClear(GL_COLOR_BUFFER_BIT);
-   glXSwapBuffers(dpy, win);
-
+   glXSwapBuffers(dpy, gwin);
+   glReadBuffer(GL_BACK);
pass = piglit_probe_pixel_rgba(0, 0, green);
-
-   glXSwapBuffers(dpy, win);
+   if (pass) {
+   glReadBuffer(GL_FRONT);
+   pass = piglit_probe_pixel_rgba(0, 0, red);
+   }
 
return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
-XVisualInfo *
-piglit_get_swap_exchange_visual(Display *dpy)
+static GLXFBConfig *
+piglit_get_swap_exchange_config(Display *dpy)
 {
-   XVisualInfo *visinfo;
+   GLXFBConfig *fbc;
+   int nele;
int attrib[] = {
-   GLX_RGBA,
-   GLX_RED_SIZE, 1,
-   GLX_GREEN_SIZE, 1,
-   GLX_BLUE_SIZE, 1,
-   GLX_DOUBLEBUFFER,
+   GLX_RENDER_TYPE, GLX_RGBA_BIT,
+   GLX_RED_SIZE, 8,
+   GLX_GREEN_SIZE, 8,
+   GLX_BLUE_SIZE, 8,
+   GLX_ALPHA_SIZE, 8,
GLX_SWAP_METHOD_OML, GLX_SWAP_EXCHANGE_OML,
+   GLX_DOUBLEBUFFER, True,
None
};
int screen = DefaultScreen(dpy);
 
-   visinfo = glXChooseVisual(dpy, screen, attrib);
-   if (visinfo == NULL) {
+   fbc = glXChooseFBConfig(dpy, screen, attrib, );
+   if (fbc == NULL) {
fprintf(stderr,
"Couldn't get a GLX_SWAP_EXCHANGE_OML, RGBA, "
-   "double-buffered visual\n");
+   "double-buffered fbconfig\n");
piglit_report_result(PIGLIT_SKIP);
exit(1);
}
 
-   return visinfo;
+   return fbc;
 }
 
 int
@@ -97,6 +102,8 @@ main(int argc, char **argv)
 {
int i;
const char *glx_extension_list;
+   Window win;
+   XVisualInfo *visinfo;
 
for(i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "-auto"))
@@ -117,10 +124,21 @@ main(int argc, char **argv)
piglit_report_result(PIGLIT_SKIP);
}
 
-   visinfo = piglit_get_swap_exchange_visual(dpy);
+   config = piglit_get_swap_exchange_config(dpy);
+   visinfo = glXGetVisualFromFBConfig(dpy, config[0]);
+   if (!visinfo) {
+   printf("Error: couldn't create a visual from fbconfig.\n");
+   piglit_report_result(PIGLIT_FAIL);
+   }
+
win = piglit_get_glx_window(dpy, visinfo);
+   XFree(visinfo);
 
XMapWindow(dpy, win);
+   gwin = glXCreateWindow(dpy, config[0], win, NULL);
+   ctx = glXCreateNewContext(dpy, config[0], GLX_RGBA_TYPE, 0, GL_TRUE);
+   glXMakeContextCurrent(dpy, gwin, gwin, ctx);
+   piglit_dispatch_default_init(PIGLIT_DISPATCH_GL);
 
piglit_glx_event_loop(dpy, draw);
 
-- 
2.7.4

___
Piglit mailing list
Piglit@lists.freedesktop.org

[Piglit] [PATCH] glx: Introduce a glx-swap-copy test

2017-08-17 Thread Thomas Hellstrom
Tests the GLX_SWAP_COPY_OML swapbuffer mode. Very similar to the
glx-swap-exchange test.

Signed-off-by: Thomas Hellstrom 
---
 tests/glx/CMakeLists.gl.txt |   1 +
 tests/glx/glx-swap-copy.c   | 143 
 2 files changed, 144 insertions(+)
 create mode 100644 tests/glx/glx-swap-copy.c

diff --git a/tests/glx/CMakeLists.gl.txt b/tests/glx/CMakeLists.gl.txt
index 1e1c684..575e99b 100644
--- a/tests/glx/CMakeLists.gl.txt
+++ b/tests/glx/CMakeLists.gl.txt
@@ -52,6 +52,7 @@ IF(PIGLIT_BUILD_GLX_TESTS)
piglit_add_executable (glx-swap-event glx-swap-event.c)
piglit_add_executable (glx-make-glxdrawable-current 
glx-make-glxdrawable-current.c)
piglit_add_executable (glx-swap-exchange glx-swap-exchange.c)
+   piglit_add_executable (glx-swap-copy glx-swap-copy.c)
piglit_add_executable (glx-swap-pixmap glx-swap-pixmap.c)
piglit_add_executable (glx-swap-pixmap-bad glx-swap-pixmap-bad.c)
piglit_add_executable (glx-swap-singlebuffer glx-swap-singlebuffer.c)
diff --git a/tests/glx/glx-swap-copy.c b/tests/glx/glx-swap-copy.c
new file mode 100644
index 000..3bb1791
--- /dev/null
+++ b/tests/glx/glx-swap-copy.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2010 Intel Corporation
+ * Copyright © 2010 VMWare Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ *Eric Anholt 
+ *Thomas Hellstrom 
+ *
+ */
+
+/** @file glx-swap-copy.c
+ *
+ * Test that GLX_SWAP_COPY_OML does in fact cause the back buffer to get
+ * preserved on swap.
+ */
+
+#include "piglit-util-gl.h"
+#include "piglit-glx-util.h"
+
+int piglit_width = 50, piglit_height = 50;
+static Display *dpy;
+static XVisualInfo *visinfo;
+static GLXFBConfig *config;
+static GLXContext ctx;
+static GLXWindow gwin;
+
+enum piglit_result
+draw(Display *dpy)
+{
+   GLboolean pass = GL_TRUE;
+   static const float red[] = {1.0, 0.0, 0.0, 0.5};
+
+   glXMakeContextCurrent(dpy, gwin, gwin, ctx);
+   glClearColor(1.0, 0.0, 0.0, 0.5);
+   glClear(GL_COLOR_BUFFER_BIT);
+   glXMakeContextCurrent(dpy, None, None, NULL);
+   glXSwapBuffers(dpy, gwin);
+   glXSwapBuffers(dpy, gwin);
+   glXSwapBuffers(dpy, gwin);
+   glXMakeContextCurrent(dpy, gwin, gwin, ctx);
+   glReadBuffer(GL_BACK);
+   pass = piglit_probe_pixel_rgba(0, 0, red);
+   if (pass) {
+   glReadBuffer(GL_FRONT);
+   pass = piglit_probe_pixel_rgb(0, 0, red);
+   }
+
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+
+static GLXFBConfig *
+piglit_get_swap_copy_config(Display *dpy)
+{
+   GLXFBConfig *fbc;
+   int nele;
+   int attrib[] = {
+   GLX_RENDER_TYPE, GLX_RGBA_BIT,
+   GLX_RED_SIZE, 8,
+   GLX_GREEN_SIZE, 8,
+   GLX_BLUE_SIZE, 8,
+   GLX_ALPHA_SIZE, 8,
+   GLX_SWAP_METHOD_OML, GLX_SWAP_COPY_OML,
+   GLX_DOUBLEBUFFER, True,
+   None
+   };
+   int screen = DefaultScreen(dpy);
+
+   fbc = glXChooseFBConfig(dpy, screen, attrib, );
+   if (fbc == NULL) {
+   fprintf(stderr,
+   "Couldn't get a GLX_SWAP_COPY_OML, RGBA, "
+   "double-buffered fbconfig\n");
+   piglit_report_result(PIGLIT_SKIP);
+   exit(1);
+   }
+
+   return fbc;
+}
+
+int
+main(int argc, char **argv)
+{
+   int i;
+   const char *glx_extension_list;
+   static Window win;
+
+   for(i = 1; i < argc; ++i) {
+   if (!strcmp(argv[i], "-auto"))
+   piglit_automatic = 1;
+   else
+   fprintf(stderr, "Unknown option: %s\n", argv[i]);
+   }
+
+   dpy = XOpenDisplay(NULL);
+   if (dpy == NULL) {
+   fprintf(stderr, "couldn't open