util: Move piglit-util to piglit-util-gl-common

Move piglit-util.* to piglit-util-gl-common.*

Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>

72 files changed, 72 insertions, 72 deletions

diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c
index 2a5351d5..74698b0c 100644
--- a/tests/fbo/fbo-1d.c
+++ b/tests/fbo/fbo-1d.c
@@ -31,7 +31,7 @@
  * succeeds.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 32
 
diff --git a/tests/fbo/fbo-3d.c b/tests/fbo/fbo-3d.c
index e1a2e0fb..dcd03025 100644
--- a/tests/fbo/fbo-3d.c
+++ b/tests/fbo/fbo-3d.c
@@ -31,7 +31,7 @@
  * of those individual depths to the window system framebuffer succeeds.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 32
 #define BUF_HEIGHT 32
diff --git a/tests/fbo/fbo-alpha.c b/tests/fbo/fbo-alpha.c
index 69efec66..766ed7ad 100644
--- a/tests/fbo/fbo-alpha.c
+++ b/tests/fbo/fbo-alpha.c
@@ -31,7 +31,7 @@
  * GL_ARB_framebuffer_object.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-alphatest-formats.c b/tests/fbo/fbo-alphatest-formats.c
index 8cef6d2d..2ef271ec 100644
--- a/tests/fbo/fbo-alphatest-formats.c
+++ b/tests/fbo/fbo-alphatest-formats.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "fbo-formats.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/fbo/fbo-alphatest-nocolor-ff.c b/tests/fbo/fbo-alphatest-nocolor-ff.c
index 9c983f37..a0f66909 100644
--- a/tests/fbo/fbo-alphatest-nocolor-ff.c
+++ b/tests/fbo/fbo-alphatest-nocolor-ff.c
@@ -28,7 +28,7 @@
  * testing correctly.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 32
 
diff --git a/tests/fbo/fbo-alphatest-nocolor.c b/tests/fbo/fbo-alphatest-nocolor.c
index 503ef114..d0b4c1cd 100644
--- a/tests/fbo/fbo-alphatest-nocolor.c
+++ b/tests/fbo/fbo-alphatest-nocolor.c
@@ -27,7 +27,7 @@
  * and alpha testing enabled does the alpha testing correctly.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 32
 
diff --git a/tests/fbo/fbo-array.c b/tests/fbo/fbo-array.c
index 01d96bf9..2f75b9e0 100644
--- a/tests/fbo/fbo-array.c
+++ b/tests/fbo/fbo-array.c
@@ -33,7 +33,7 @@
  * based on fbo-3d.c and array-texture.c
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 32
 #define BUF_HEIGHT 32
diff --git a/tests/fbo/fbo-bind-renderbuffer.c b/tests/fbo/fbo-bind-renderbuffer.c
index 7de68ab9..6b2f4f8d 100644
--- a/tests/fbo/fbo-bind-renderbuffer.c
+++ b/tests/fbo/fbo-bind-renderbuffer.c
@@ -31,7 +31,7 @@
  *                             GL_RENDERBUFFER_EXT, rb);
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/fbo/fbo-blending-formats.c b/tests/fbo/fbo-blending-formats.c
index 31832f5e..9fb5bca2 100644
--- a/tests/fbo/fbo-blending-formats.c
+++ b/tests/fbo/fbo-blending-formats.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "fbo-formats.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/fbo/fbo-blit-d24s8.c b/tests/fbo/fbo-blit-d24s8.c
index 1e55cc9a..81b8bc84 100644
--- a/tests/fbo/fbo-blit-d24s8.c
+++ b/tests/fbo/fbo-blit-d24s8.c
@@ -36,7 +36,7 @@
  * See also fbo-blit.c
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     150 /*window_width*/,
diff --git a/tests/fbo/fbo-blit.c b/tests/fbo/fbo-blit.c
index 5b4c697a..51934888 100644
--- a/tests/fbo/fbo-blit.c
+++ b/tests/fbo/fbo-blit.c
@@ -34,7 +34,7 @@
  * See also fbo-readdrawpix.c and fbo-copypix.c
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     150 /*window_width*/,
diff --git a/tests/fbo/fbo-clear-formats.c b/tests/fbo/fbo-clear-formats.c
index 13faba8a..868d3bee 100644
--- a/tests/fbo/fbo-clear-formats.c
+++ b/tests/fbo/fbo-clear-formats.c
@@ -31,7 +31,7 @@
  * texture-based FBOs of various internalformats.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "fbo-formats.h"
 
 #define TEX_WIDTH 256
diff --git a/tests/fbo/fbo-clearmipmap.c b/tests/fbo/fbo-clearmipmap.c
index 0f0c3670..f1ea0e85 100644
--- a/tests/fbo/fbo-clearmipmap.c
+++ b/tests/fbo/fbo-clearmipmap.c
@@ -32,7 +32,7 @@
  * Catches a 965 driver bug that idr ran into trying to write an app.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     700 /*window_width*/,
diff --git a/tests/fbo/fbo-copypix.c b/tests/fbo/fbo-copypix.c
index 3ba88ba7..fcc420c4 100644
--- a/tests/fbo/fbo-copypix.c
+++ b/tests/fbo/fbo-copypix.c
@@ -31,7 +31,7 @@
  * See also fbo-blit.c and fbo-readdrawpix.c
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     150 /*window_width*/,
diff --git a/tests/fbo/fbo-copyteximage-simple.c b/tests/fbo/fbo-copyteximage-simple.c
index e1ea2821..8a9aea18 100644
--- a/tests/fbo/fbo-copyteximage-simple.c
+++ b/tests/fbo/fbo-copyteximage-simple.c
@@ -33,7 +33,7 @@
  * into another texture.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define TEX_WIDTH 256
 #define TEX_HEIGHT 256
diff --git a/tests/fbo/fbo-copyteximage.c b/tests/fbo/fbo-copyteximage.c
index 5a294f03..604bea0d 100644
--- a/tests/fbo/fbo-copyteximage.c
+++ b/tests/fbo/fbo-copyteximage.c
@@ -31,7 +31,7 @@
  * This tries to catch a bug with the Intel driver and texture tiling.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define TEX_WIDTH 254
 #define TEX_HEIGHT 254
diff --git a/tests/fbo/fbo-cubemap.c b/tests/fbo/fbo-cubemap.c
index 71db3c23..b67e9966 100644
--- a/tests/fbo/fbo-cubemap.c
+++ b/tests/fbo/fbo-cubemap.c
@@ -31,7 +31,7 @@
  * of those faces to the window system framebuffer succeeds.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 32
 #define BUF_HEIGHT 32
diff --git a/tests/fbo/fbo-depth-array.c b/tests/fbo/fbo-depth-array.c
index 2f1a7274..2b264b45 100644
--- a/tests/fbo/fbo-depth-array.c
+++ b/tests/fbo/fbo-depth-array.c
@@ -36,7 +36,7 @@
  * based on fbo-array.c
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 32
 #define BUF_HEIGHT 32
diff --git a/tests/fbo/fbo-depth-sample-compare.c b/tests/fbo/fbo-depth-sample-compare.c
index 15155d62..47aefb31 100644
--- a/tests/fbo/fbo-depth-sample-compare.c
+++ b/tests/fbo/fbo-depth-sample-compare.c
@@ -37,7 +37,7 @@
 
 
 #include <assert.h>
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 
 /** Set DEBUG to 1 to enable extra output when trying to debug failures */
diff --git a/tests/fbo/fbo-depth-tex1d.c b/tests/fbo/fbo-depth-tex1d.c
index 973b40c5..edd7a89b 100644
--- a/tests/fbo/fbo-depth-tex1d.c
+++ b/tests/fbo/fbo-depth-tex1d.c
@@ -32,7 +32,7 @@
  * and then drawing both to the framebuffer succeeds.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 16
 
diff --git a/tests/fbo/fbo-depth.c b/tests/fbo/fbo-depth.c
index c6c62668..fdb61fb9 100644
--- a/tests/fbo/fbo-depth.c
+++ b/tests/fbo/fbo-depth.c
@@ -28,7 +28,7 @@
  * with depth buffers.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_SIZE 123
 
diff --git a/tests/fbo/fbo-depthstencil.c b/tests/fbo/fbo-depthstencil.c
index 54a8bae3..91a4da01 100644
--- a/tests/fbo/fbo-depthstencil.c
+++ b/tests/fbo/fbo-depthstencil.c
@@ -28,7 +28,7 @@
  * with depth-stencil buffers.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_SIZE 123
 
diff --git a/tests/fbo/fbo-depthtex.c b/tests/fbo/fbo-depthtex.c
index 1a094219..a801ae7a 100644
--- a/tests/fbo/fbo-depthtex.c
+++ b/tests/fbo/fbo-depthtex.c
@@ -29,7 +29,7 @@
  * depth texture would be created before the draw to that texture.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     640 /*window_width*/,
diff --git a/tests/fbo/fbo-deriv.c b/tests/fbo/fbo-deriv.c
index e79588cc..68349a5a 100644
--- a/tests/fbo/fbo-deriv.c
+++ b/tests/fbo/fbo-deriv.c
@@ -43,7 +43,7 @@
  * framebuffer.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
diff --git a/tests/fbo/fbo-draw-buffers-blend.c b/tests/fbo/fbo-draw-buffers-blend.c
index 1a1ffe00..4fb158a0 100644
--- a/tests/fbo/fbo-draw-buffers-blend.c
+++ b/tests/fbo/fbo-draw-buffers-blend.c
@@ -32,7 +32,7 @@
  * Test GL_ARB_draw_buffers_blend extension (per-buffer blend state)
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/fbo/fbo-drawbuffers-arbfp.c b/tests/fbo/fbo-drawbuffers-arbfp.c
index d16e3087..b3266d8e 100644
--- a/tests/fbo/fbo-drawbuffers-arbfp.c
+++ b/tests/fbo/fbo-drawbuffers-arbfp.c
@@ -32,7 +32,7 @@
  * ARB_draw_buffers and ARB_fragment_program works.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-drawbuffers-blend-add.c b/tests/fbo/fbo-drawbuffers-blend-add.c
index 33fa7404..3392f5b0 100644
--- a/tests/fbo/fbo-drawbuffers-blend-add.c
+++ b/tests/fbo/fbo-drawbuffers-blend-add.c
@@ -32,7 +32,7 @@
  */
 
 #include <string.h>
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
diff --git a/tests/fbo/fbo-drawbuffers-fragcolor.c b/tests/fbo/fbo-drawbuffers-fragcolor.c
index 7992853d..080c9764 100644
--- a/tests/fbo/fbo-drawbuffers-fragcolor.c
+++ b/tests/fbo/fbo-drawbuffers-fragcolor.c
@@ -32,7 +32,7 @@
  */
 
 #include <string.h>
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
diff --git a/tests/fbo/fbo-drawbuffers-maxtargets.c b/tests/fbo/fbo-drawbuffers-maxtargets.c
index e30066ef..d257f8bd 100644
--- a/tests/fbo/fbo-drawbuffers-maxtargets.c
+++ b/tests/fbo/fbo-drawbuffers-maxtargets.c
@@ -32,7 +32,7 @@
  */
 
 #include <string.h>
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
diff --git a/tests/fbo/fbo-drawbuffers.c b/tests/fbo/fbo-drawbuffers.c
index b14dc0a9..882be353 100644
--- a/tests/fbo/fbo-drawbuffers.c
+++ b/tests/fbo/fbo-drawbuffers.c
@@ -31,7 +31,7 @@
  * ARB_draw_buffers and fixed function fragment works.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-drawbuffers2-blend.c b/tests/fbo/fbo-drawbuffers2-blend.c
index be41ab82..74df808f 100644
--- a/tests/fbo/fbo-drawbuffers2-blend.c
+++ b/tests/fbo/fbo-drawbuffers2-blend.c
@@ -31,7 +31,7 @@
  * EXT_draw_buffers2 works.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-drawbuffers2-colormask.c b/tests/fbo/fbo-drawbuffers2-colormask.c
index 37f351f6..6de94454 100644
--- a/tests/fbo/fbo-drawbuffers2-colormask.c
+++ b/tests/fbo/fbo-drawbuffers2-colormask.c
@@ -31,7 +31,7 @@
  * EXT_draw_buffers2 works.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-finish-deleted.c b/tests/fbo/fbo-finish-deleted.c
index 0b797126..1b02d92c 100644
--- a/tests/fbo/fbo-finish-deleted.c
+++ b/tests/fbo/fbo-finish-deleted.c
@@ -29,7 +29,7 @@
  * https://bugs.freedesktop.org/show_bug.cgi?id=34656
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 32
 #define BUF_HEIGHT 32
diff --git a/tests/fbo/fbo-flushing-2.c b/tests/fbo/fbo-flushing-2.c
index 809cf865..c84b2dab 100644
--- a/tests/fbo/fbo-flushing-2.c
+++ b/tests/fbo/fbo-flushing-2.c
@@ -35,7 +35,7 @@
  * had been removed.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 #define TEX_WIDTH 8
diff --git a/tests/fbo/fbo-flushing.c b/tests/fbo/fbo-flushing.c
index 6b27cea2..898864ec 100644
--- a/tests/fbo/fbo-flushing.c
+++ b/tests/fbo/fbo-flushing.c
@@ -35,7 +35,7 @@
  * removed.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 #define TEX_WIDTH 128
diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c
index c180e9a7..2a7671c6 100644
--- a/tests/fbo/fbo-fragcoord.c
+++ b/tests/fbo/fbo-fragcoord.c
@@ -26,7 +26,7 @@
  * Tests that gl_FragCoord produces the expected output in a fragment shader.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define WIDTH 256
 #define HEIGHT 256
diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c
index df2c6e76..ecde0382 100644
--- a/tests/fbo/fbo-fragcoord2.c
+++ b/tests/fbo/fbo-fragcoord2.c
@@ -30,7 +30,7 @@
  * Author: Brian Paul
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/fbo/fbo-generatemipmap-array.c b/tests/fbo/fbo-generatemipmap-array.c
index 7095bc0e..a4304e64 100644
--- a/tests/fbo/fbo-generatemipmap-array.c
+++ b/tests/fbo/fbo-generatemipmap-array.c
@@ -31,7 +31,7 @@
  * Tests that glGenerateMipmapEXT works correctly on level of a 2D array texture.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define TEX_WIDTH 128
 #define TEX_HEIGHT 128
diff --git a/tests/fbo/fbo-generatemipmap-filtering.c b/tests/fbo/fbo-generatemipmap-filtering.c
index 5334e213..041284be 100644
--- a/tests/fbo/fbo-generatemipmap-filtering.c
+++ b/tests/fbo/fbo-generatemipmap-filtering.c
@@ -26,7 +26,7 @@
  * Tests that glGenerateMipmapEXT uses appropriate filtering for a 2D texture.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define TEX_WIDTH 256
 #define TEX_HEIGHT 256
diff --git a/tests/fbo/fbo-generatemipmap-formats.c b/tests/fbo/fbo-generatemipmap-formats.c
index b6216a2d..1282a1da 100644
--- a/tests/fbo/fbo-generatemipmap-formats.c
+++ b/tests/fbo/fbo-generatemipmap-formats.c
@@ -31,7 +31,7 @@
  * internalformats.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "fbo-formats.h"
 
 static int tex_width = 256;
diff --git a/tests/fbo/fbo-generatemipmap-noimage.c b/tests/fbo/fbo-generatemipmap-noimage.c
index 3d7d9efc..8b92aa3e 100644
--- a/tests/fbo/fbo-generatemipmap-noimage.c
+++ b/tests/fbo/fbo-generatemipmap-noimage.c
@@ -29,7 +29,7 @@
  * https://bugs.freedesktop.org/show_bug.cgi?id=40308
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     32 /*window_width*/,
diff --git a/tests/fbo/fbo-generatemipmap-nonsquare.c b/tests/fbo/fbo-generatemipmap-nonsquare.c
index 7bbd6a8d..444bb2e1 100644
--- a/tests/fbo/fbo-generatemipmap-nonsquare.c
+++ b/tests/fbo/fbo-generatemipmap-nonsquare.c
@@ -32,7 +32,7 @@
  * Modified by Marek Olšák <maraeo@gmail.com> to reproduce FDO bug #27338.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define TEX_WIDTH 256
 #define TEX_HEIGHT 64
diff --git a/tests/fbo/fbo-generatemipmap-npot.c b/tests/fbo/fbo-generatemipmap-npot.c
index b8622dee..73d9bf2f 100644
--- a/tests/fbo/fbo-generatemipmap-npot.c
+++ b/tests/fbo/fbo-generatemipmap-npot.c
@@ -30,7 +30,7 @@
  * Tests that glGenerateMipmapEXT works correctly on a 2D texture.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define TEX_WIDTH 254
 #define TEX_HEIGHT 254
diff --git a/tests/fbo/fbo-generatemipmap-scissor.c b/tests/fbo/fbo-generatemipmap-scissor.c
index 1b8e2a33..f5f3001a 100644
--- a/tests/fbo/fbo-generatemipmap-scissor.c
+++ b/tests/fbo/fbo-generatemipmap-scissor.c
@@ -33,7 +33,7 @@
  * Compare this test to fbo-generatemipmap.c.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define TEX_WIDTH 256
 #define TEX_HEIGHT 256
diff --git a/tests/fbo/fbo-generatemipmap-viewport.c b/tests/fbo/fbo-generatemipmap-viewport.c
index 1a924a12..cd8173d8 100644
--- a/tests/fbo/fbo-generatemipmap-viewport.c
+++ b/tests/fbo/fbo-generatemipmap-viewport.c
@@ -34,7 +34,7 @@
  * Pierre Willenbrock <pierre@pirsoft.de>.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define TEX_WIDTH 256
 #define TEX_HEIGHT 256
diff --git a/tests/fbo/fbo-generatemipmap.c b/tests/fbo/fbo-generatemipmap.c
index 50a0ba13..bad9afdc 100644
--- a/tests/fbo/fbo-generatemipmap.c
+++ b/tests/fbo/fbo-generatemipmap.c
@@ -30,7 +30,7 @@
  * Tests that glGenerateMipmapEXT works correctly on a 2D texture.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define TEX_WIDTH 256
 #define TEX_HEIGHT 256
diff --git a/tests/fbo/fbo-getframebufferattachmentparameter-01.c b/tests/fbo/fbo-getframebufferattachmentparameter-01.c
index 904d3224..8bb8bf14 100644
--- a/tests/fbo/fbo-getframebufferattachmentparameter-01.c
+++ b/tests/fbo/fbo-getframebufferattachmentparameter-01.c
@@ -28,7 +28,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     30 /*window_width*/,
diff --git a/tests/fbo/fbo-gl_pointcoord.c b/tests/fbo/fbo-gl_pointcoord.c
index e7c5400c..80e6dd41 100644
--- a/tests/fbo/fbo-gl_pointcoord.c
+++ b/tests/fbo/fbo-gl_pointcoord.c
@@ -28,7 +28,7 @@
  * Verify that applications can use point coordinate correctly with FBO.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/fbo/fbo-incomplete-texture-01.c b/tests/fbo/fbo-incomplete-texture-01.c
index b570cd87..5112f101 100644
--- a/tests/fbo/fbo-incomplete-texture-01.c
+++ b/tests/fbo/fbo-incomplete-texture-01.c
@@ -33,7 +33,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     30 /*window_width*/,
diff --git a/tests/fbo/fbo-incomplete-texture-02.c b/tests/fbo/fbo-incomplete-texture-02.c
index 7cb1ab4b..1f3a0057 100644
--- a/tests/fbo/fbo-incomplete-texture-02.c
+++ b/tests/fbo/fbo-incomplete-texture-02.c
@@ -33,7 +33,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     30 /*window_width*/,
diff --git a/tests/fbo/fbo-incomplete-texture-03.c b/tests/fbo/fbo-incomplete-texture-03.c
index 9aca8671..335a1edf 100644
--- a/tests/fbo/fbo-incomplete-texture-03.c
+++ b/tests/fbo/fbo-incomplete-texture-03.c
@@ -32,7 +32,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     30 /*window_width*/,
diff --git a/tests/fbo/fbo-incomplete-texture-04.c b/tests/fbo/fbo-incomplete-texture-04.c
index f6fa3140..9063b7b6 100644
--- a/tests/fbo/fbo-incomplete-texture-04.c
+++ b/tests/fbo/fbo-incomplete-texture-04.c
@@ -33,7 +33,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     30 /*window_width*/,
diff --git a/tests/fbo/fbo-integer.c b/tests/fbo/fbo-integer.c
index 39e83ad9..1e5599b1 100644
--- a/tests/fbo/fbo-integer.c
+++ b/tests/fbo/fbo-integer.c
@@ -28,7 +28,7 @@
  */
 
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     100 /*window_width*/,
diff --git a/tests/fbo/fbo-luminance-alpha.c b/tests/fbo/fbo-luminance-alpha.c
index 91f09e3a..b945e899 100644
--- a/tests/fbo/fbo-luminance-alpha.c
+++ b/tests/fbo/fbo-luminance-alpha.c
@@ -33,7 +33,7 @@
  * GL_ARB_framebuffer_object.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-maxsize.c b/tests/fbo/fbo-maxsize.c
index 387bcb41..ae4f6564 100644
--- a/tests/fbo/fbo-maxsize.c
+++ b/tests/fbo/fbo-maxsize.c
@@ -27,7 +27,7 @@
  * Tests that rendering to a texture of maximum size works.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     256 /*window_width*/,
diff --git a/tests/fbo/fbo-mipmap-copypix.c b/tests/fbo/fbo-mipmap-copypix.c
index 3f105bb5..a7b70db5 100644
--- a/tests/fbo/fbo-mipmap-copypix.c
+++ b/tests/fbo/fbo-mipmap-copypix.c
@@ -31,7 +31,7 @@
  * May 25, 2011
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     50 /*window_width*/,
diff --git a/tests/fbo/fbo-nodepth-test.c b/tests/fbo/fbo-nodepth-test.c
index 40236da3..a401ea53 100644
--- a/tests/fbo/fbo-nodepth-test.c
+++ b/tests/fbo/fbo-nodepth-test.c
@@ -31,7 +31,7 @@
  * succeeds regardless of depth func.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-nostencil-test.c b/tests/fbo/fbo-nostencil-test.c
index 960ccb85..62dd7d96 100644
--- a/tests/fbo/fbo-nostencil-test.c
+++ b/tests/fbo/fbo-nostencil-test.c
@@ -31,7 +31,7 @@
  * succeeds regardless of stencil funcs.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-pbo-readpixels-small.c b/tests/fbo/fbo-pbo-readpixels-small.c
index e5f5f6ad..b3fb6f43 100644
--- a/tests/fbo/fbo-pbo-readpixels-small.c
+++ b/tests/fbo/fbo-pbo-readpixels-small.c
@@ -34,7 +34,7 @@
  * https://bugs.freedesktop.org/show_bug.cgi?id=25921
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 8
 #define BUF_HEIGHT 8
diff --git a/tests/fbo/fbo-readdrawpix.c b/tests/fbo/fbo-readdrawpix.c
index f94a150e..dc275767 100644
--- a/tests/fbo/fbo-readdrawpix.c
+++ b/tests/fbo/fbo-readdrawpix.c
@@ -31,7 +31,7 @@
  * See also fbo-blit.c and fbo-copypix.c
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     150 /*window_width*/,
diff --git a/tests/fbo/fbo-readpixels-depth-formats.c b/tests/fbo/fbo-readpixels-depth-formats.c
index 1f4fc983..72233062 100644
--- a/tests/fbo/fbo-readpixels-depth-formats.c
+++ b/tests/fbo/fbo-readpixels-depth-formats.c
@@ -28,7 +28,7 @@
  * combinations.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 15
 #define BUF_HEIGHT 15
diff --git a/tests/fbo/fbo-readpixels.c b/tests/fbo/fbo-readpixels.c
index 0fae9b7a..36c4bc15 100644
--- a/tests/fbo/fbo-readpixels.c
+++ b/tests/fbo/fbo-readpixels.c
@@ -31,7 +31,7 @@
  * glReadPixels() versus glClear and immediate mode rendering.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_WIDTH 32
 #define BUF_HEIGHT 32
diff --git a/tests/fbo/fbo-rg.c b/tests/fbo/fbo-rg.c
index 4589cce9..55850513 100644
--- a/tests/fbo/fbo-rg.c
+++ b/tests/fbo/fbo-rg.c
@@ -35,7 +35,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 
 #define EPSILON (1.0 / 255.0)
diff --git a/tests/fbo/fbo-scissor-bitmap.c b/tests/fbo/fbo-scissor-bitmap.c
index f4199913..458572ef 100644
--- a/tests/fbo/fbo-scissor-bitmap.c
+++ b/tests/fbo/fbo-scissor-bitmap.c
@@ -32,7 +32,7 @@
  * This is a mirror of scissor-bitmap.c to windows.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/fbo/fbo-srgb-blit.c b/tests/fbo/fbo-srgb-blit.c
index c9e8195b..22f71158 100644
--- a/tests/fbo/fbo-srgb-blit.c
+++ b/tests/fbo/fbo-srgb-blit.c
@@ -28,7 +28,7 @@
  * linear color space.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-srgb.c b/tests/fbo/fbo-srgb.c
index 401c0068..4f5682d2 100644
--- a/tests/fbo/fbo-srgb.c
+++ b/tests/fbo/fbo-srgb.c
@@ -33,7 +33,7 @@
  * To get SRGB blending EXT_framebuffer_sRGB is required.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-stencil.c b/tests/fbo/fbo-stencil.c
index ea322f17..cb91063d 100644
--- a/tests/fbo/fbo-stencil.c
+++ b/tests/fbo/fbo-stencil.c
@@ -28,7 +28,7 @@
  * with stencil buffers.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 #define BUF_SIZE 123
 
diff --git a/tests/fbo/fbo-storage-completeness.c b/tests/fbo/fbo-storage-completeness.c
index 4a163b0e..40a519aa 100644
--- a/tests/fbo/fbo-storage-completeness.c
+++ b/tests/fbo/fbo-storage-completeness.c
@@ -31,7 +31,7 @@
  *    Marek Olšák
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/fbo/fbo-storage-formats.c b/tests/fbo/fbo-storage-formats.c
index da96d839..f51c7901 100644
--- a/tests/fbo/fbo-storage-formats.c
+++ b/tests/fbo/fbo-storage-formats.c
@@ -30,7 +30,7 @@
  *    Brian Paul
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(
diff --git a/tests/fbo/fbo-sys-blit.c b/tests/fbo/fbo-sys-blit.c
index d8d942a4..71dbc644 100644
--- a/tests/fbo/fbo-sys-blit.c
+++ b/tests/fbo/fbo-sys-blit.c
@@ -27,7 +27,7 @@
  * Test FBO blits involving the window-system-provided framebuffer.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-sys-sub-blit.c b/tests/fbo/fbo-sys-sub-blit.c
index fb9e71ef..8e7fc986 100644
--- a/tests/fbo/fbo-sys-sub-blit.c
+++ b/tests/fbo/fbo-sys-sub-blit.c
@@ -28,7 +28,7 @@
  * Test FBO blits involving a subset of the window-system buffer.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 
 PIGLIT_GL_TEST_MAIN(
     128 /*window_width*/,
diff --git a/tests/fbo/fbo-viewport.c b/tests/fbo/fbo-viewport.c
index 496711ee..8806dc08 100644
--- a/tests/fbo/fbo-viewport.c
+++ b/tests/fbo/fbo-viewport.c
@@ -29,7 +29,7 @@
  * same thing into an FBO.  Compare the images.  They should be the same.
  */
 
-#include "piglit-util.h"
+#include "piglit-util-gl-common.h"
 #include "piglit-framework.h"
 
 PIGLIT_GL_TEST_MAIN(