summaryrefslogtreecommitdiff
path: root/tests/glx
diff options
context:
space:
mode:
Diffstat (limited to 'tests/glx')
-rw-r--r--tests/glx/glx-buffer-age.c2
-rw-r--r--tests/glx/glx-close-display.c2
-rw-r--r--tests/glx/glx-copy-sub-buffer.c2
-rw-r--r--tests/glx/glx-destroycontext-1.c2
-rw-r--r--tests/glx/glx-destroycontext-2.c2
-rw-r--r--tests/glx/glx-dont-care-mask.c2
-rw-r--r--tests/glx/glx-fbconfig-compliance.c2
-rw-r--r--tests/glx/glx-fbconfig-sanity.c2
-rw-r--r--tests/glx/glx-fbo-binding.c2
-rw-r--r--tests/glx/glx-make-current-bad-context.c2
-rw-r--r--tests/glx/glx-make-current.c2
-rw-r--r--tests/glx/glx-make-glxdrawable-current.c2
-rw-r--r--tests/glx/glx-multi-context-ib-1.c2
-rw-r--r--tests/glx/glx-multithread-makecurrent-1.c2
-rw-r--r--tests/glx/glx-multithread-makecurrent-2.c2
-rw-r--r--tests/glx/glx-multithread-makecurrent-3.c2
-rw-r--r--tests/glx/glx-multithread-makecurrent-4.c2
-rw-r--r--tests/glx/glx-multithread-shader-compile.c2
-rw-r--r--tests/glx/glx-multithread-texture.c2
-rw-r--r--tests/glx/glx-multithread.c2
-rw-r--r--tests/glx/glx-pixmap-crosscheck.c2
-rw-r--r--tests/glx/glx-pixmap-life.c2
-rw-r--r--tests/glx/glx-pixmap-multi.c2
-rw-r--r--tests/glx/glx-pixmap13-life.c2
-rw-r--r--tests/glx/glx-query-drawable.c2
-rw-r--r--tests/glx/glx-shader-sharing.c2
-rw-r--r--tests/glx/glx-string-sanity.c2
-rw-r--r--tests/glx/glx-swap-event.c2
-rw-r--r--tests/glx/glx-swap-exchange.c2
-rw-r--r--tests/glx/glx-swap-pixmap-bad.c2
-rw-r--r--tests/glx/glx-swap-pixmap.c2
-rw-r--r--tests/glx/glx-swap-singlebuffer.c2
-rw-r--r--tests/glx/glx-tfp.c2
-rw-r--r--tests/glx/glx-visuals-depth.c2
-rw-r--r--tests/glx/glx-visuals-stencil.c2
-rw-r--r--tests/glx/glx-window-life.c2
36 files changed, 36 insertions, 36 deletions
diff --git a/tests/glx/glx-buffer-age.c b/tests/glx/glx-buffer-age.c
index 8008500a1..d20761694 100644
--- a/tests/glx/glx-buffer-age.c
+++ b/tests/glx/glx-buffer-age.c
@@ -36,7 +36,7 @@
* Test that GLX_EXT_buffer_age works as advertised
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
#ifndef GLX_BACK_BUFFER_AGE_EXT
diff --git a/tests/glx/glx-close-display.c b/tests/glx/glx-close-display.c
index 478987223..7a2c71ff1 100644
--- a/tests/glx/glx-close-display.c
+++ b/tests/glx/glx-close-display.c
@@ -31,7 +31,7 @@
* Test that calling XCloseDisplay after using GLX context works correctly.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
/**
diff --git a/tests/glx/glx-copy-sub-buffer.c b/tests/glx/glx-copy-sub-buffer.c
index 5bf28f268..2acf22bac 100644
--- a/tests/glx/glx-copy-sub-buffer.c
+++ b/tests/glx/glx-copy-sub-buffer.c
@@ -33,7 +33,7 @@
* Test that GLX_MESA_copy_sub_buffer works as advertised
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 100, piglit_height = 100;
diff --git a/tests/glx/glx-destroycontext-1.c b/tests/glx/glx-destroycontext-1.c
index fc27b6e59..638d75675 100644
--- a/tests/glx/glx-destroycontext-1.c
+++ b/tests/glx/glx-destroycontext-1.c
@@ -31,7 +31,7 @@
* current thread works correctly.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-destroycontext-2.c b/tests/glx/glx-destroycontext-2.c
index e4c6d372a..d12ac0e37 100644
--- a/tests/glx/glx-destroycontext-2.c
+++ b/tests/glx/glx-destroycontext-2.c
@@ -31,7 +31,7 @@
* current thread works correctly.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-dont-care-mask.c b/tests/glx/glx-dont-care-mask.c
index dace55875..642dc9cbc 100644
--- a/tests/glx/glx-dont-care-mask.c
+++ b/tests/glx/glx-dont-care-mask.c
@@ -37,7 +37,7 @@
* \sa https://bugs.freedesktop.org/show_bug.cgi?id=47478
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 10;
diff --git a/tests/glx/glx-fbconfig-compliance.c b/tests/glx/glx-fbconfig-compliance.c
index 0cd2183cc..5a19881ba 100644
--- a/tests/glx/glx-fbconfig-compliance.c
+++ b/tests/glx/glx-fbconfig-compliance.c
@@ -27,7 +27,7 @@
* minimum requirements specified by GLX 1.4 section 3.3.3
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
static PFNGLXGETFBCONFIGSPROC GetFBConfigs = NULL;
diff --git a/tests/glx/glx-fbconfig-sanity.c b/tests/glx/glx-fbconfig-sanity.c
index 9e570aa5d..9af89bf92 100644
--- a/tests/glx/glx-fbconfig-sanity.c
+++ b/tests/glx/glx-fbconfig-sanity.c
@@ -27,7 +27,7 @@
* This reproduces X.org bugzilla #34265, among much else.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 10;
diff --git a/tests/glx/glx-fbo-binding.c b/tests/glx/glx-fbo-binding.c
index bfdc4dd0a..c454cbf72 100644
--- a/tests/glx/glx-fbo-binding.c
+++ b/tests/glx/glx-fbo-binding.c
@@ -27,7 +27,7 @@
* June 15, 2011
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-make-current-bad-context.c b/tests/glx/glx-make-current-bad-context.c
index 0064251c2..55b3c9849 100644
--- a/tests/glx/glx-make-current-bad-context.c
+++ b/tests/glx/glx-make-current-bad-context.c
@@ -27,7 +27,7 @@
* GLXBadContext.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-make-current.c b/tests/glx/glx-make-current.c
index dde99b4f5..fd284ba70 100644
--- a/tests/glx/glx-make-current.c
+++ b/tests/glx/glx-make-current.c
@@ -32,7 +32,7 @@
*
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-make-glxdrawable-current.c b/tests/glx/glx-make-glxdrawable-current.c
index fc339be7f..6f3c14a04 100644
--- a/tests/glx/glx-make-glxdrawable-current.c
+++ b/tests/glx/glx-make-glxdrawable-current.c
@@ -33,7 +33,7 @@
* https://bugs.freedesktop.org/show_bug.cgi?id=30457
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-multi-context-ib-1.c b/tests/glx/glx-multi-context-ib-1.c
index 2b3c00ea4..5b6a59ab3 100644
--- a/tests/glx/glx-multi-context-ib-1.c
+++ b/tests/glx/glx-multi-context-ib-1.c
@@ -31,7 +31,7 @@
*/
#include <unistd.h>
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-multithread-makecurrent-1.c b/tests/glx/glx-multithread-makecurrent-1.c
index acfc27916..b60fceea1 100644
--- a/tests/glx/glx-multithread-makecurrent-1.c
+++ b/tests/glx/glx-multithread-makecurrent-1.c
@@ -29,7 +29,7 @@
*/
#include <unistd.h>
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
#include "pthread.h"
diff --git a/tests/glx/glx-multithread-makecurrent-2.c b/tests/glx/glx-multithread-makecurrent-2.c
index 60da0aee4..714ade1d9 100644
--- a/tests/glx/glx-multithread-makecurrent-2.c
+++ b/tests/glx/glx-multithread-makecurrent-2.c
@@ -30,7 +30,7 @@
*/
#include <unistd.h>
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
#include "pthread.h"
diff --git a/tests/glx/glx-multithread-makecurrent-3.c b/tests/glx/glx-multithread-makecurrent-3.c
index 12ffe8602..413754dfc 100644
--- a/tests/glx/glx-multithread-makecurrent-3.c
+++ b/tests/glx/glx-multithread-makecurrent-3.c
@@ -30,7 +30,7 @@
*/
#include <unistd.h>
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
#include "pthread.h"
diff --git a/tests/glx/glx-multithread-makecurrent-4.c b/tests/glx/glx-multithread-makecurrent-4.c
index c25114779..f8f4da03e 100644
--- a/tests/glx/glx-multithread-makecurrent-4.c
+++ b/tests/glx/glx-multithread-makecurrent-4.c
@@ -29,7 +29,7 @@
*/
#include <unistd.h>
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
#include "pthread.h"
diff --git a/tests/glx/glx-multithread-shader-compile.c b/tests/glx/glx-multithread-shader-compile.c
index 82042d586..f24e1761f 100644
--- a/tests/glx/glx-multithread-shader-compile.c
+++ b/tests/glx/glx-multithread-shader-compile.c
@@ -29,7 +29,7 @@
* Exercises a race conditon with the r600 llvm compiler.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
#include "pthread.h"
diff --git a/tests/glx/glx-multithread-texture.c b/tests/glx/glx-multithread-texture.c
index 59dc73031..94ca1bc2e 100644
--- a/tests/glx/glx-multithread-texture.c
+++ b/tests/glx/glx-multithread-texture.c
@@ -30,7 +30,7 @@
#include <unistd.h>
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
#include "pthread.h"
diff --git a/tests/glx/glx-multithread.c b/tests/glx/glx-multithread.c
index f88f8da9b..92dbe2abc 100644
--- a/tests/glx/glx-multithread.c
+++ b/tests/glx/glx-multithread.c
@@ -31,7 +31,7 @@
* to the same GLX window works correctly.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
#include "pthread.h"
diff --git a/tests/glx/glx-pixmap-crosscheck.c b/tests/glx/glx-pixmap-crosscheck.c
index 0b3f1bdca..40c10743c 100644
--- a/tests/glx/glx-pixmap-crosscheck.c
+++ b/tests/glx/glx-pixmap-crosscheck.c
@@ -33,7 +33,7 @@
* what to expect if you aren't that fastidious.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-pixmap-life.c b/tests/glx/glx-pixmap-life.c
index bf1ce2a64..da2d7b993 100644
--- a/tests/glx/glx-pixmap-life.c
+++ b/tests/glx/glx-pixmap-life.c
@@ -31,7 +31,7 @@
* either order, without error.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-pixmap-multi.c b/tests/glx/glx-pixmap-multi.c
index a0dddfeee..88a2184e2 100644
--- a/tests/glx/glx-pixmap-multi.c
+++ b/tests/glx/glx-pixmap-multi.c
@@ -31,7 +31,7 @@
* attached to the same X pixmap, so one must assume it's allowed.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-pixmap13-life.c b/tests/glx/glx-pixmap13-life.c
index be45f8166..ae9a0d2d9 100644
--- a/tests/glx/glx-pixmap13-life.c
+++ b/tests/glx/glx-pixmap13-life.c
@@ -32,7 +32,7 @@
* fbconfigs.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-query-drawable.c b/tests/glx/glx-query-drawable.c
index 49ac2276f..9a83395ec 100644
--- a/tests/glx/glx-query-drawable.c
+++ b/tests/glx/glx-query-drawable.c
@@ -30,7 +30,7 @@
* For usage information, see usage_error();
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 137;
diff --git a/tests/glx/glx-shader-sharing.c b/tests/glx/glx-shader-sharing.c
index 1b180aed3..1a022c09e 100644
--- a/tests/glx/glx-shader-sharing.c
+++ b/tests/glx/glx-shader-sharing.c
@@ -29,7 +29,7 @@
* draw with second context.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-string-sanity.c b/tests/glx/glx-string-sanity.c
index 1711d23da..3a86f11b8 100644
--- a/tests/glx/glx-string-sanity.c
+++ b/tests/glx/glx-string-sanity.c
@@ -29,7 +29,7 @@
*/
#include <stdbool.h>
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
static const char *
diff --git a/tests/glx/glx-swap-event.c b/tests/glx/glx-swap-event.c
index baae6f32d..74a16cc5c 100644
--- a/tests/glx/glx-swap-event.c
+++ b/tests/glx/glx-swap-event.c
@@ -29,7 +29,7 @@
*
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "GL/glx.h"
#include <sys/time.h>
diff --git a/tests/glx/glx-swap-exchange.c b/tests/glx/glx-swap-exchange.c
index c064a6c1b..3f045f855 100644
--- a/tests/glx/glx-swap-exchange.c
+++ b/tests/glx/glx-swap-exchange.c
@@ -31,7 +31,7 @@
* exchanged on swap.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-swap-pixmap-bad.c b/tests/glx/glx-swap-pixmap-bad.c
index 52a0749d8..c97e1bae6 100644
--- a/tests/glx/glx-swap-pixmap-bad.c
+++ b/tests/glx/glx-swap-pixmap-bad.c
@@ -32,7 +32,7 @@
* GLXBadDrawable error.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-swap-pixmap.c b/tests/glx/glx-swap-pixmap.c
index 7635e0dd8..c557f3aea 100644
--- a/tests/glx/glx-swap-pixmap.c
+++ b/tests/glx/glx-swap-pixmap.c
@@ -32,7 +32,7 @@
* non-double-buffered GLXFBConfig, or if draw is a GLXPixmap.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-swap-singlebuffer.c b/tests/glx/glx-swap-singlebuffer.c
index a747149c6..425ebca23 100644
--- a/tests/glx/glx-swap-singlebuffer.c
+++ b/tests/glx/glx-swap-singlebuffer.c
@@ -31,7 +31,7 @@
* non-double-buffered GLXFBConfig, or if draw is a GLXPixmap.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;
diff --git a/tests/glx/glx-tfp.c b/tests/glx/glx-tfp.c
index 413d92048..c27c89a49 100644
--- a/tests/glx/glx-tfp.c
+++ b/tests/glx/glx-tfp.c
@@ -35,7 +35,7 @@
* Neil Roberts <neil@linux.intel.com>.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
#include "GL/glx.h"
#include "X11/extensions/Xrender.h"
diff --git a/tests/glx/glx-visuals-depth.c b/tests/glx/glx-visuals-depth.c
index 8db98bb2a..13c7cce2a 100644
--- a/tests/glx/glx-visuals-depth.c
+++ b/tests/glx/glx-visuals-depth.c
@@ -35,7 +35,7 @@
* if we try to enable it.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 20;
diff --git a/tests/glx/glx-visuals-stencil.c b/tests/glx/glx-visuals-stencil.c
index 12fcfd376..6eaef3857 100644
--- a/tests/glx/glx-visuals-stencil.c
+++ b/tests/glx/glx-visuals-stencil.c
@@ -35,7 +35,7 @@
* if we try to enable it.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 20;
diff --git a/tests/glx/glx-window-life.c b/tests/glx/glx-window-life.c
index dc58bbf4d..5e9c50252 100644
--- a/tests/glx/glx-window-life.c
+++ b/tests/glx/glx-window-life.c
@@ -31,7 +31,7 @@
* destroying a Window should destroy the GLXWindow.
*/
-#include "piglit-util-gl-common.h"
+#include "piglit-util-gl.h"
#include "piglit-glx-util.h"
int piglit_width = 50, piglit_height = 50;