diff options
| author | Blaž Tomažič <blaz.tomazic@gmail.com> | 2012-06-28 02:32:25 +0200 |
|---|---|---|
| committer | Blaž Tomažič <blaz.tomazic@gmail.com> | 2012-06-28 03:02:19 +0200 |
| commit | 2d3c6e51c25a6915d1fc74a13d2b57591bcf4ea8 (patch) | |
| tree | 8654e8f1cb00c2a58822c30a8b25caa22e836391 | |
| parent | 3c830b8713fe2afc7134aad8152427e8c50a41ab (diff) | |
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>
705 files changed, 707 insertions, 707 deletions
diff --git a/tests/asmparsertest/asmparsertest.c b/tests/asmparsertest/asmparsertest.c index 2481af3ed..c0f977ecd 100644 --- a/tests/asmparsertest/asmparsertest.c +++ b/tests/asmparsertest/asmparsertest.c @@ -23,7 +23,7 @@ #include <ctype.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #ifndef TRUE #define FALSE 0 diff --git a/tests/bugs/crash-cubemap-order.c b/tests/bugs/crash-cubemap-order.c index 2d07fc059..3b95eaca9 100644 --- a/tests/bugs/crash-cubemap-order.c +++ b/tests/bugs/crash-cubemap-order.c @@ -6,7 +6,7 @@ * This bug existed in the R300 driver and was triggered by Sauerbraten. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/bugs/crash-texparameter-before-teximage.c b/tests/bugs/crash-texparameter-before-teximage.c index 581cb1b55..345eabb91 100644 --- a/tests/bugs/crash-texparameter-before-teximage.c +++ b/tests/bugs/crash-texparameter-before-teximage.c @@ -7,7 +7,7 @@ * This bug was originally triggered by Glest. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/bugs/drawbuffer-modes.c b/tests/bugs/drawbuffer-modes.c index 94ee90d70..30cb7edb4 100644 --- a/tests/bugs/drawbuffer-modes.c +++ b/tests/bugs/drawbuffer-modes.c @@ -34,7 +34,7 @@ * * \Author Yi Sun <yi.sun@intel.com>, Anuj Phogat <anuj.phogat@gmail.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/bugs/fdo10370.c b/tests/bugs/fdo10370.c index 996c0ee10..5fd84f349 100644 --- a/tests/bugs/fdo10370.c +++ b/tests/bugs/fdo10370.c @@ -3,7 +3,7 @@ * http://bugs.freedesktop.org/show_bug.cgi?id=10370 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/bugs/fdo14575.c b/tests/bugs/fdo14575.c index 09d0f5124..0748230ad 100644 --- a/tests/bugs/fdo14575.c +++ b/tests/bugs/fdo14575.c @@ -30,7 +30,7 @@ * * Tests that the driver doesn't fail when deleting a mapped buffer object. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/bugs/fdo20701.c b/tests/bugs/fdo20701.c index a00fb149f..08afed65e 100644 --- a/tests/bugs/fdo20701.c +++ b/tests/bugs/fdo20701.c @@ -34,7 +34,7 @@ * passes. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/bugs/fdo22540.c b/tests/bugs/fdo22540.c index f2cd24ec7..3e5d5d519 100644 --- a/tests/bugs/fdo22540.c +++ b/tests/bugs/fdo22540.c @@ -23,7 +23,7 @@ // author: Ben Holmes -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/bugs/fdo23489.c b/tests/bugs/fdo23489.c index afdfb4763..ae206bf22 100644 --- a/tests/bugs/fdo23489.c +++ b/tests/bugs/fdo23489.c @@ -3,7 +3,7 @@ * http://bugs.freedesktop.org/show_bug.cgi?id=23489 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, diff --git a/tests/bugs/fdo23670-depth_test.c b/tests/bugs/fdo23670-depth_test.c index bef9d71cf..85a1f9906 100644 --- a/tests/bugs/fdo23670-depth_test.c +++ b/tests/bugs/fdo23670-depth_test.c @@ -24,7 +24,7 @@ * Shuang he <shuang.he@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/bugs/fdo23670-drawpix_stencil.c b/tests/bugs/fdo23670-drawpix_stencil.c index 207223378..c2498995c 100644 --- a/tests/bugs/fdo23670-drawpix_stencil.c +++ b/tests/bugs/fdo23670-drawpix_stencil.c @@ -24,7 +24,7 @@ * Shuang he <shuang.he@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/bugs/fdo24066.c b/tests/bugs/fdo24066.c index 5308a9ce1..2d8b1bd30 100644 --- a/tests/bugs/fdo24066.c +++ b/tests/bugs/fdo24066.c @@ -32,7 +32,7 @@ * before a fragment program has been setup. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c index 15f208d2d..5075bf615 100644 --- a/tests/bugs/fdo25614-genmipmap.c +++ b/tests/bugs/fdo25614-genmipmap.c @@ -31,7 +31,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /* Pick the number of LODs to examine and the size of the texture so that the * smallest LOD is the one where each of the 4x4 tiles in the checkerboard diff --git a/tests/bugs/fdo28551.c b/tests/bugs/fdo28551.c index cf4ea8e17..e256571fe 100644 --- a/tests/bugs/fdo28551.c +++ b/tests/bugs/fdo28551.c @@ -24,7 +24,7 @@ * Kristian Høgsberg <krh@bitplanet.net> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/bugs/fdo31934.c b/tests/bugs/fdo31934.c index 644d6e1e2..c5b8392fa 100644 --- a/tests/bugs/fdo31934.c +++ b/tests/bugs/fdo31934.c @@ -1,4 +1,4 @@ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, diff --git a/tests/bugs/fdo9833.c b/tests/bugs/fdo9833.c index 5f5a7dcf6..0192ec1d8 100644 --- a/tests/bugs/fdo9833.c +++ b/tests/bugs/fdo9833.c @@ -3,7 +3,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=9833 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c index f7e27f663..8e1069f71 100644 --- a/tests/bugs/point-sprite.c +++ b/tests/bugs/point-sprite.c @@ -28,7 +28,7 @@ * \author Ben Holmes */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define BOX_SIZE 64 diff --git a/tests/bugs/r300-readcache.c b/tests/bugs/r300-readcache.c index 24db1d389..6f0a65aab 100644 --- a/tests/bugs/r300-readcache.c +++ b/tests/bugs/r300-readcache.c @@ -15,7 +15,7 @@ * so this test is always automatic. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/bugs/tex1d-2dborder.c b/tests/bugs/tex1d-2dborder.c index dc294ea5e..c93e2fe8c 100644 --- a/tests/bugs/tex1d-2dborder.c +++ b/tests/bugs/tex1d-2dborder.c @@ -30,7 +30,7 @@ * 2D textures, which caused incorrect sampling of border colors. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/bugs/tri-tex-crash.c b/tests/bugs/tri-tex-crash.c index 36bbca2ef..5f11587be 100644 --- a/tests/bugs/tri-tex-crash.c +++ b/tests/bugs/tri-tex-crash.c @@ -28,7 +28,7 @@ * LLVMpipe crash which only seems to happen when SSE4.1 is not used. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/bugs/vbo-buffer-unmap.c b/tests/bugs/vbo-buffer-unmap.c index d19d8c48a..c4e1f1df0 100644 --- a/tests/bugs/vbo-buffer-unmap.c +++ b/tests/bugs/vbo-buffer-unmap.c @@ -30,7 +30,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/egl/egl-create-surface.c b/tests/egl/egl-create-surface.c index c58d0f13e..2c7224e64 100644 --- a/tests/egl/egl-create-surface.c +++ b/tests/egl/egl-create-surface.c @@ -34,7 +34,7 @@ * error is generated. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "egl-util.h" static const EGLint pixmap_attribs[] = { diff --git a/tests/egl/egl-nok-swap-region.c b/tests/egl/egl-nok-swap-region.c index 9493d4ddb..9124161c2 100644 --- a/tests/egl/egl-nok-swap-region.c +++ b/tests/egl/egl-nok-swap-region.c @@ -28,7 +28,7 @@ * Test EGL_NOK_swap_region. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "egl-util.h" #ifdef EGL_NOK_swap_region diff --git a/tests/egl/egl-nok-texture-from-pixmap.c b/tests/egl/egl-nok-texture-from-pixmap.c index 95ecbf364..026e17bc8 100644 --- a/tests/egl/egl-nok-texture-from-pixmap.c +++ b/tests/egl/egl-nok-texture-from-pixmap.c @@ -28,7 +28,7 @@ * Test EGL_NOK_texture_from_pixmap */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "egl-util.h" #ifdef EGL_NOK_texture_from_pixmap diff --git a/tests/egl/egl-util.c b/tests/egl/egl-util.c index 41fc31f79..440e720a5 100644 --- a/tests/egl/egl-util.c +++ b/tests/egl/egl-util.c @@ -30,7 +30,7 @@ * \author Kristian Høgsberg <krh@bitplanet.net> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "egl-util.h" static int automatic; diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c index 2a5351d5f..74698b0c8 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 e1a2e0fb8..dcd030255 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 69efec667..766ed7ad7 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 8cef6d2de..2ef271ec7 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 9c983f37e..a0f66909a 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 503ef1143..d0b4c1cd0 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 01d96bf91..2f75b9e03 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 7de68ab9e..6b2f4f8d4 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 31832f5e2..9fb5bca21 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 1e55cc9a9..81b8bc844 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 5b4c697a9..519348887 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 13faba8a9..868d3bee5 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 0f0c3670c..f1ea0e859 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 3ba88ba70..fcc420c49 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 e1ea28212..8a9aea18a 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 5a294f036..604bea0d5 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 71db3c238..b67e99668 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 2f1a72741..2b264b459 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 15155d62f..47aefb31c 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 973b40c5f..edd7a89b9 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 c6c62668b..fdb61fb95 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 54a8bae3d..91a4da01d 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 1a094219c..a801ae7a1 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 e79588cc7..68349a5a2 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 1a1ffe002..4fb158a05 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 d16e30878..b3266d8e6 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 33fa7404a..3392f5b05 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 7992853de..080c9764b 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 e30066efd..d257f8bd2 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 b14dc0a9d..882be3530 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 be41ab821..74df808f6 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 37f351f64..6de94454b 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 0b7971269..1b02d92c9 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 809cf8657..c84b2dab2 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 6b27cea2e..898864ecd 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 c180e9a74..2a7671c6c 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 df2c6e76a..ecde0382e 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 7095bc0e0..a4304e643 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 5334e2135..041284be8 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 b6216a2d9..1282a1daa 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 3d7d9efcd..8b92aa3e7 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 7bbd6a8d0..444bb2e12 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 b8622dee5..73d9bf2f6 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 1b8e2a336..f5f3001a0 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 1a924a128..cd8173d84 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 50a0ba138..bad9afdc1 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 904d32245..8bb8bf144 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 e7c5400cc..80e6dd414 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 b570cd87d..5112f101b 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 7cb1ab4bd..1f3a00579 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 9aca86714..335a1edf0 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 f6fa31409..9063b7b69 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 39e83ad9d..1e5599b19 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 91f09e3a6..b945e8993 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 387bcb41b..ae4f6564c 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 3f105bb58..a7b70db5e 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 40236da35..a401ea53e 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 960ccb859..62dd7d962 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 e5f5f6ad5..b3fb6f43a 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 f94a150ed..dc275767d 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 1f4fc9832..722330623 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 0fae9b7a4..36c4bc156 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 4589cce90..55850513d 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 f4199913b..458572ef3 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 c9e8195bd..22f71158c 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 401c0068a..4f5682d2b 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 ea322f176..cb91063d4 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 4a163b0e5..40a519aa2 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 da96d8399..f51c79018 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 d8d942a4f..71dbc644e 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 fb9e71ef8..8e7fc986a 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 496711eeb..8806dc080 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( diff --git a/tests/general/array-stride.c b/tests/general/array-stride.c index 10cf56717..84e730dcd 100644 --- a/tests/general/array-stride.c +++ b/tests/general/array-stride.c @@ -27,7 +27,7 @@ * June 14, 2011 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c index 5ae79dd17..f7b65fb93 100644 --- a/tests/general/bgra-sec-color-pointer.c +++ b/tests/general/bgra-sec-color-pointer.c @@ -30,7 +30,7 @@ * with alpha blending. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c index cd3e9957d..f9e52f905 100644 --- a/tests/general/bgra-vert-attrib-pointer.c +++ b/tests/general/bgra-vert-attrib-pointer.c @@ -29,7 +29,7 @@ * two quads are drawn without blending and two are drawn with alpha blending. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c index 325e4e4ff..a02beb6d6 100644 --- a/tests/general/blendminmax.c +++ b/tests/general/blendminmax.c @@ -32,7 +32,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c index f8931a167..8e23acf4e 100644 --- a/tests/general/blendsquare.c +++ b/tests/general/blendsquare.c @@ -32,7 +32,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/clear-accum.c b/tests/general/clear-accum.c index 1647067f2..58ebfba6c 100644 --- a/tests/general/clear-accum.c +++ b/tests/general/clear-accum.c @@ -30,7 +30,7 @@ * Tests that clear accum buffer */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c index d3c1e0a98..c6b8e7801 100644 --- a/tests/general/clear-varray-2.0.c +++ b/tests/general/clear-varray-2.0.c @@ -32,7 +32,7 @@ * fd.o bug #21638 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/general/copy-pixels.c b/tests/general/copy-pixels.c index 72df073e9..20767f92b 100644 --- a/tests/general/copy-pixels.c +++ b/tests/general/copy-pixels.c @@ -29,7 +29,7 @@ * Author: Anuj Phogat */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define IMAGE_WIDTH 16 diff --git a/tests/general/copypixels-draw-sync.c b/tests/general/copypixels-draw-sync.c index d811ef436..a75fd1649 100644 --- a/tests/general/copypixels-draw-sync.c +++ b/tests/general/copypixels-draw-sync.c @@ -29,7 +29,7 @@ * syncing on the i965 driver. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/copypixels-sync.c b/tests/general/copypixels-sync.c index 6de7be05b..9df1a4cd8 100644 --- a/tests/general/copypixels-sync.c +++ b/tests/general/copypixels-sync.c @@ -28,7 +28,7 @@ * blit ring IRQ handling on the i965 driver. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/depth-clamp-range.c b/tests/general/depth-clamp-range.c index 9cc37b78f..cd9a0920b 100644 --- a/tests/general/depth-clamp-range.c +++ b/tests/general/depth-clamp-range.c @@ -30,7 +30,7 @@ * and properly uses the min/max selection. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, diff --git a/tests/general/depth_clamp.c b/tests/general/depth_clamp.c index 9b602de13..bf80f942d 100644 --- a/tests/general/depth_clamp.c +++ b/tests/general/depth_clamp.c @@ -34,7 +34,7 @@ * the same operations against the far plane. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c index a433b212e..cbabf06cc 100644 --- a/tests/general/depthfunc.c +++ b/tests/general/depthfunc.c @@ -30,7 +30,7 @@ * Tests that glDepthFunc()'s various modes all work correctly. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/depthrange-clear.c b/tests/general/depthrange-clear.c index e9b6f4ae0..95f5ff50c 100644 --- a/tests/general/depthrange-clear.c +++ b/tests/general/depthrange-clear.c @@ -31,7 +31,7 @@ * Caught a regression in the intel driver with the metaops clear code. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/dlist-clear.c b/tests/general/dlist-clear.c index b65a00561..e07f2d1da 100644 --- a/tests/general/dlist-clear.c +++ b/tests/general/dlist-clear.c @@ -32,7 +32,7 @@ * with the new metaops clear code. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/dlist-color-material.c b/tests/general/dlist-color-material.c index 0e5bfaa6e..ae2bceef8 100644 --- a/tests/general/dlist-color-material.c +++ b/tests/general/dlist-color-material.c @@ -33,7 +33,7 @@ #include <assert.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c index 3cbb382e1..4a7cb9547 100644 --- a/tests/general/dlist-fdo3129-01.c +++ b/tests/general/dlist-fdo3129-01.c @@ -28,7 +28,7 @@ * This test is based on a test case posted to fdo bug #3129 by David Reveman. * Once upon a time, this triggered an assertion failure in Mesa. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c index cdfaab4d8..fece8269e 100644 --- a/tests/general/dlist-fdo3129-02.c +++ b/tests/general/dlist-fdo3129-02.c @@ -28,7 +28,7 @@ * This test is based on a test case posted to fdo bug #3129 by Nicolai Hähnle. * Once upon a time, this triggered an assertion failure in Mesa. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/dlist-fdo31590.c b/tests/general/dlist-fdo31590.c index cd2b53ef4..7629b22ef 100644 --- a/tests/general/dlist-fdo31590.c +++ b/tests/general/dlist-fdo31590.c @@ -33,7 +33,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" static const char *TestName = "dlist-fdo31590"; diff --git a/tests/general/draw-arrays-colormaterial.c b/tests/general/draw-arrays-colormaterial.c index c2c9ce64c..86355d60d 100644 --- a/tests/general/draw-arrays-colormaterial.c +++ b/tests/general/draw-arrays-colormaterial.c @@ -30,7 +30,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c index 2d9126ae4..87a097b60 100644 --- a/tests/general/draw-batch.c +++ b/tests/general/draw-batch.c @@ -22,7 +22,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/draw-copypixels-sync.c b/tests/general/draw-copypixels-sync.c index a9ed1f8d2..d102a7610 100644 --- a/tests/general/draw-copypixels-sync.c +++ b/tests/general/draw-copypixels-sync.c @@ -28,7 +28,7 @@ * stresses render to blitter syncing on the i965 driver. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/draw-elements-base-vertex-bounds.c b/tests/general/draw-elements-base-vertex-bounds.c index 572352f06..ba7e6805a 100644 --- a/tests/general/draw-elements-base-vertex-bounds.c +++ b/tests/general/draw-elements-base-vertex-bounds.c @@ -33,7 +33,7 @@ * In Mesa Gallium 7.11 this causes a crash. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 300 /*window_width*/, diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c index 0a8cd27ba..bea22379e 100644 --- a/tests/general/draw-elements-base-vertex-neg.c +++ b/tests/general/draw-elements-base-vertex-neg.c @@ -24,7 +24,7 @@ * Marek Olšák <maraeo@gmail.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/general/draw-elements-base-vertex.c b/tests/general/draw-elements-base-vertex.c index 04a8af4ce..4695d08a5 100644 --- a/tests/general/draw-elements-base-vertex.c +++ b/tests/general/draw-elements-base-vertex.c @@ -30,7 +30,7 @@ * index buffers. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 300 /*window_width*/, diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c index eb0e1af8a..3a837e4d5 100644 --- a/tests/general/draw-elements-vs-inputs.c +++ b/tests/general/draw-elements-vs-inputs.c @@ -37,7 +37,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 300 /*window_width*/, diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c index b26b4fc00..089a8a4cf 100644 --- a/tests/general/draw-elements.c +++ b/tests/general/draw-elements.c @@ -29,7 +29,7 @@ * elements formats. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/general/draw-instanced-divisor.c b/tests/general/draw-instanced-divisor.c index d7151c05e..3c37bb992 100644 --- a/tests/general/draw-instanced-divisor.c +++ b/tests/general/draw-instanced-divisor.c @@ -27,7 +27,7 @@ * Tests GL_ARB_draw_instanced and GL_ARB_instanced_arrays */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, diff --git a/tests/general/draw-instanced.c b/tests/general/draw-instanced.c index 00ea4d6de..6ddbaaa21 100644 --- a/tests/general/draw-instanced.c +++ b/tests/general/draw-instanced.c @@ -27,7 +27,7 @@ * Tests GL_ARB_draw_instanced */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, diff --git a/tests/general/draw-pixel-with-texture.c b/tests/general/draw-pixel-with-texture.c index 92e667823..c59517160 100644 --- a/tests/general/draw-pixel-with-texture.c +++ b/tests/general/draw-pixel-with-texture.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c index 8a6e3390c..6ee312953 100644 --- a/tests/general/draw-pixels.c +++ b/tests/general/draw-pixels.c @@ -30,7 +30,7 @@ * author: Anuj Phogat */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /* Data conversions as used in mesa */ /** Convert GLubyte in [0,255] to GLfloat in [0.0,1.0] */ diff --git a/tests/general/draw-sync.c b/tests/general/draw-sync.c index 881fc2c89..42d6306bf 100644 --- a/tests/general/draw-sync.c +++ b/tests/general/draw-sync.c @@ -28,7 +28,7 @@ * ring IRQ handling on the i965 driver. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c index 95f7b9b88..04b03ea5f 100644 --- a/tests/general/draw-vertices-half-float.c +++ b/tests/general/draw-vertices-half-float.c @@ -29,7 +29,7 @@ * This one is for half float vertices. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c index b23d5f8f7..2f65c7875 100644 --- a/tests/general/draw-vertices.c +++ b/tests/general/draw-vertices.c @@ -29,7 +29,7 @@ * but tests for various vertex formats are provided too. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/general/drawpix-z.c b/tests/general/drawpix-z.c index 3cc4096d6..53ec6b2a1 100644 --- a/tests/general/drawpix-z.c +++ b/tests/general/drawpix-z.c @@ -34,7 +34,7 @@ * visible. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN(200 /*window_width*/, 200 /*window_height*/, diff --git a/tests/general/early-z.c b/tests/general/early-z.c index e56c2f021..028d3b9f9 100644 --- a/tests/general/early-z.c +++ b/tests/general/early-z.c @@ -27,7 +27,7 @@ * Test for bugs with early depth testing and early depth update. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c index 35cdf4b5a..fcee94749 100644 --- a/tests/general/fog-modes.c +++ b/tests/general/fog-modes.c @@ -26,7 +26,7 @@ * Tests that the three fog modes work with fog enabled using the depth value. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #if defined(_WIN32) diff --git a/tests/general/fragment-center.c b/tests/general/fragment-center.c index 16049dbfb..4d8c4947f 100644 --- a/tests/general/fragment-center.c +++ b/tests/general/fragment-center.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 96 /*window_width*/, diff --git a/tests/general/framebuffer-srgb.c b/tests/general/framebuffer-srgb.c index eca8b87e5..a47b0dd09 100644 --- a/tests/general/framebuffer-srgb.c +++ b/tests/general/framebuffer-srgb.c @@ -32,7 +32,7 @@ * the API acts correctly in that case. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/general/getactiveattrib.c b/tests/general/getactiveattrib.c index fc92d5ade..2867d43e3 100644 --- a/tests/general/getactiveattrib.c +++ b/tests/general/getactiveattrib.c @@ -29,7 +29,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/geterror-inside-begin.c b/tests/general/geterror-inside-begin.c index cd9bcd2b7..bec42212d 100644 --- a/tests/general/geterror-inside-begin.c +++ b/tests/general/geterror-inside-begin.c @@ -33,7 +33,7 @@ * @author Vinson Lee <vlee@vmware.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/geterror-invalid-enum.c b/tests/general/geterror-invalid-enum.c index 9002d893d..82c2aae6a 100644 --- a/tests/general/geterror-invalid-enum.c +++ b/tests/general/geterror-invalid-enum.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/general/gl30basic.c b/tests/general/gl30basic.c index 6cc67d8fd..b58311940 100644 --- a/tests/general/gl30basic.c +++ b/tests/general/gl30basic.c @@ -31,7 +31,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/hiz.c b/tests/general/hiz.c index 07d67a3f7..584f83287 100644 --- a/tests/general/hiz.c +++ b/tests/general/hiz.c @@ -30,7 +30,7 @@ * Tests that two overlapping triangles are rendered correctly. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/infinite-spot-light.c b/tests/general/infinite-spot-light.c index 278b54205..a08c5b96d 100644 --- a/tests/general/infinite-spot-light.c +++ b/tests/general/infinite-spot-light.c @@ -39,7 +39,7 @@ * infinite light is met. This is somehow not permitted by glSpec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c index 5a95a22c6..45b3246b7 100644 --- a/tests/general/isbufferobj.c +++ b/tests/general/isbufferobj.c @@ -32,7 +32,7 @@ * Test glIsBuffer() */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/line-aa-width.c b/tests/general/line-aa-width.c index 604783680..4f780ac0b 100644 --- a/tests/general/line-aa-width.c +++ b/tests/general/line-aa-width.c @@ -36,7 +36,7 @@ * ugly. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 300 /*window_width*/, diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c index 36ec57aaa..96c87e978 100644 --- a/tests/general/linestipple.c +++ b/tests/general/linestipple.c @@ -26,7 +26,7 @@ * Test basic line stippling functionality. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/general/longprim.c b/tests/general/longprim.c index a2f21ed4a..e7c0e7ec8 100644 --- a/tests/general/longprim.c +++ b/tests/general/longprim.c @@ -28,7 +28,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/general/object_purgeable-api-pbo.c b/tests/general/object_purgeable-api-pbo.c index cab51c22e..4132c595f 100644 --- a/tests/general/object_purgeable-api-pbo.c +++ b/tests/general/object_purgeable-api-pbo.c @@ -29,7 +29,7 @@ * Simple test of the API for GL_APPLE_object_purgeable with GL_ARB_pixel_buffer_object. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "object_purgeable.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/object_purgeable-api-texture.c b/tests/general/object_purgeable-api-texture.c index 2e78a879b..52dcc5d32 100644 --- a/tests/general/object_purgeable-api-texture.c +++ b/tests/general/object_purgeable-api-texture.c @@ -29,7 +29,7 @@ * Simple test of the API for GL_APPLE_object_purgeable with texture object. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "object_purgeable.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/object_purgeable-api-vbo.c b/tests/general/object_purgeable-api-vbo.c index 4b8ba88c7..12d719f8b 100644 --- a/tests/general/object_purgeable-api-vbo.c +++ b/tests/general/object_purgeable-api-vbo.c @@ -29,7 +29,7 @@ * Simple test of the API for GL_APPLE_object_purgeable with GL_ARB_vertex_buffer_object. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "object_purgeable.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/object_purgeable.c b/tests/general/object_purgeable.c index 1c53b594f..8783f8d16 100644 --- a/tests/general/object_purgeable.c +++ b/tests/general/object_purgeable.c @@ -25,7 +25,7 @@ * Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "object_purgeable.h" #define FAIL_ON_ERROR(string) \ diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c index b35fb64db..bc1cd1ad7 100644 --- a/tests/general/occlusion-query-discard.c +++ b/tests/general/occlusion-query-discard.c @@ -31,7 +31,7 @@ * Simple test for GL_ARB_occlusion_query with a discard statement in GLSL. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, diff --git a/tests/general/occlusion_query.c b/tests/general/occlusion_query.c index 8a4f7eafa..11b466e7b 100644 --- a/tests/general/occlusion_query.c +++ b/tests/general/occlusion_query.c @@ -29,7 +29,7 @@ * Simple test for GL_ARB_occlusion_query. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 180 /*window_width*/, diff --git a/tests/general/oes-read-format.c b/tests/general/oes-read-format.c index 660190a30..9b5495eb9 100644 --- a/tests/general/oes-read-format.c +++ b/tests/general/oes-read-format.c @@ -31,7 +31,7 @@ * for ReadPixels. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/pbo-drawpixels.c b/tests/general/pbo-drawpixels.c index c60a2a0aa..84588e046 100644 --- a/tests/general/pbo-drawpixels.c +++ b/tests/general/pbo-drawpixels.c @@ -31,7 +31,7 @@ * Caught a bug with the Intel driver with the metaops drawpixels code. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/pbo-read-argb8888.c b/tests/general/pbo-read-argb8888.c index 1947c8628..9639c70cc 100644 --- a/tests/general/pbo-read-argb8888.c +++ b/tests/general/pbo-read-argb8888.c @@ -32,7 +32,7 @@ * This test should hit the blit-based readpixels in the intel driver. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/pbo-readpixels-small.c b/tests/general/pbo-readpixels-small.c index 54ff1ce48..a4b008b93 100644 --- a/tests/general/pbo-readpixels-small.c +++ b/tests/general/pbo-readpixels-small.c @@ -36,7 +36,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=25921 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 2 /*window_width*/, diff --git a/tests/general/pbo-teximage-tiling-2.c b/tests/general/pbo-teximage-tiling-2.c index 185e5f51d..0c37d8488 100644 --- a/tests/general/pbo-teximage-tiling-2.c +++ b/tests/general/pbo-teximage-tiling-2.c @@ -32,7 +32,7 @@ * be on Intel. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/pbo-teximage-tiling.c b/tests/general/pbo-teximage-tiling.c index 6ab31d13f..b43f47e70 100644 --- a/tests/general/pbo-teximage-tiling.c +++ b/tests/general/pbo-teximage-tiling.c @@ -32,7 +32,7 @@ * be on Intel. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/pbo-teximage.c b/tests/general/pbo-teximage.c index 3fb840d33..7b2343ec8 100644 --- a/tests/general/pbo-teximage.c +++ b/tests/general/pbo-teximage.c @@ -30,7 +30,7 @@ * Tests that using a PBO as the unpack buffer for glTexImage works correctly. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/point-line-no-cull.c b/tests/general/point-line-no-cull.c index aa5254f6f..6c5b5dc6c 100644 --- a/tests/general/point-line-no-cull.c +++ b/tests/general/point-line-no-cull.c @@ -30,7 +30,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 120 /*window_width*/, diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c index 4eb515166..c0e6bfa39 100644 --- a/tests/general/polygon-mode.c +++ b/tests/general/polygon-mode.c @@ -28,7 +28,7 @@ * April 2011 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, diff --git a/tests/general/pos-array.c b/tests/general/pos-array.c index 3c1616009..291d5b36d 100644 --- a/tests/general/pos-array.c +++ b/tests/general/pos-array.c @@ -30,7 +30,7 @@ * May 2011 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/primitive-restart.c b/tests/general/primitive-restart.c index cbeb882b8..8fa66b15f 100644 --- a/tests/general/primitive-restart.c +++ b/tests/general/primitive-restart.c @@ -31,7 +31,7 @@ * Brian Paul */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/provoking-vertex.c b/tests/general/provoking-vertex.c index 07da8e0f6..cdd362a9c 100644 --- a/tests/general/provoking-vertex.c +++ b/tests/general/provoking-vertex.c @@ -31,7 +31,7 @@ * Second tri using GL_LAST_VERTEX_CONVENTION_EXT. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/quad-invariance.c b/tests/general/quad-invariance.c index 9652c148d..06b818e6a 100644 --- a/tests/general/quad-invariance.c +++ b/tests/general/quad-invariance.c @@ -36,7 +36,7 @@ * test is only a warning. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/general/read-front.c b/tests/general/read-front.c index 221042128..2e999baa7 100644 --- a/tests/general/read-front.c +++ b/tests/general/read-front.c @@ -35,7 +35,7 @@ * used as a draw buffer. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/readpix-z.c b/tests/general/readpix-z.c index b7506b049..d190ed1a6 100644 --- a/tests/general/readpix-z.c +++ b/tests/general/readpix-z.c @@ -27,7 +27,7 @@ * June 2012 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN(200 /*window_width*/, 200 /*window_height*/, diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c index 789d5403f..00c92d07b 100644 --- a/tests/general/roundmode-getintegerv.c +++ b/tests/general/roundmode-getintegerv.c @@ -39,7 +39,7 @@ * coordinate." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #include <fenv.h> diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c index cbc173b94..1ed542ed4 100644 --- a/tests/general/roundmode-pixelstore.c +++ b/tests/general/roundmode-pixelstore.c @@ -36,7 +36,7 @@ * the passed value is rounded to the nearest integer." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #include <fenv.h> diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c index 94a739d85..01db475bd 100644 --- a/tests/general/scissor-bitmap.c +++ b/tests/general/scissor-bitmap.c @@ -31,7 +31,7 @@ * it's to window boundaries or glScissor. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/scissor-clear.c b/tests/general/scissor-clear.c index c47bd9c2a..4a6fcd41b 100644 --- a/tests/general/scissor-clear.c +++ b/tests/general/scissor-clear.c @@ -30,7 +30,7 @@ * Tests that glScissor properly affects glClear(GL_COLOR_BUFFER_BIT)(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/scissor-copypixels.c b/tests/general/scissor-copypixels.c index 91af0f290..e21b9d44e 100644 --- a/tests/general/scissor-copypixels.c +++ b/tests/general/scissor-copypixels.c @@ -30,7 +30,7 @@ * Tests that glScissor properly affects glCopyPixels(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/scissor-depth-clear.c b/tests/general/scissor-depth-clear.c index a153b9b1d..dd8aa50b3 100644 --- a/tests/general/scissor-depth-clear.c +++ b/tests/general/scissor-depth-clear.c @@ -30,7 +30,7 @@ * Tests that glScissor properly affects glClear(GL_DEPTH_BUFFER_BIT). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/scissor-many.c b/tests/general/scissor-many.c index 6ad4d63ce..5162e02a7 100644 --- a/tests/general/scissor-many.c +++ b/tests/general/scissor-many.c @@ -33,7 +33,7 @@ * driver, where each scissor state is in a separate BO. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/scissor-offscreen.c b/tests/general/scissor-offscreen.c index 5412bcbba..63d0fbeb9 100644 --- a/tests/general/scissor-offscreen.c +++ b/tests/general/scissor-offscreen.c @@ -34,7 +34,7 @@ * Bug #27643 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/general/scissor-stencil-clear.c b/tests/general/scissor-stencil-clear.c index b3ca4b962..2ee6e3edd 100644 --- a/tests/general/scissor-stencil-clear.c +++ b/tests/general/scissor-stencil-clear.c @@ -30,7 +30,7 @@ * Tests that glScissor properly affects glClear of the stencil buffer. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/select.c b/tests/general/select.c index c913b3b4d..80f9c4432 100644 --- a/tests/general/select.c +++ b/tests/general/select.c @@ -31,7 +31,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/general/stencil-drawpixels.c b/tests/general/stencil-drawpixels.c index 33b16d444..beae4189c 100644 --- a/tests/general/stencil-drawpixels.c +++ b/tests/general/stencil-drawpixels.c @@ -30,7 +30,7 @@ * Tests that glDrawPixels(GL_STENCIL) minimally works. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c index 66f93c3a3..240e5ac28 100644 --- a/tests/general/stencil-twoside.c +++ b/tests/general/stencil-twoside.c @@ -33,7 +33,7 @@ * final color. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" static int use20syntax = 1; diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c index 49c3950d3..e9c3040bf 100644 --- a/tests/general/stencil-wrap.c +++ b/tests/general/stencil-wrap.c @@ -32,7 +32,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 550 /*window_width*/, diff --git a/tests/general/sync_api.c b/tests/general/sync_api.c index efb67e383..43a190ba6 100644 --- a/tests/general/sync_api.c +++ b/tests/general/sync_api.c @@ -29,7 +29,7 @@ * Simple test of the API for GL_ARB_sync. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/texgen.c b/tests/general/texgen.c index 88c640f20..020657f77 100644 --- a/tests/general/texgen.c +++ b/tests/general/texgen.c @@ -26,7 +26,7 @@ * Test a number of basic TexGen functions. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/general/texunits.c b/tests/general/texunits.c index b056df807..01264c942 100644 --- a/tests/general/texunits.c +++ b/tests/general/texunits.c @@ -28,7 +28,7 @@ * texture coord units, image units, combined units, etc. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/general/timer_query.c b/tests/general/timer_query.c index fc42cde59..726495289 100644 --- a/tests/general/timer_query.c +++ b/tests/general/timer_query.c @@ -31,7 +31,7 @@ * Simple test for GL_EXT_timer_query. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 180 /*window_width*/, diff --git a/tests/general/triangle-rasterization-overdraw.cpp b/tests/general/triangle-rasterization-overdraw.cpp index 073a426a5..2791a9e9a 100644 --- a/tests/general/triangle-rasterization-overdraw.cpp +++ b/tests/general/triangle-rasterization-overdraw.cpp @@ -41,7 +41,7 @@ * around a circle that contains the entire window, thus going off screen. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "mersenne.hpp" #include <time.h> diff --git a/tests/general/triangle-rasterization.cpp b/tests/general/triangle-rasterization.cpp index fd9dae5d1..a59551a59 100644 --- a/tests/general/triangle-rasterization.cpp +++ b/tests/general/triangle-rasterization.cpp @@ -35,7 +35,7 @@ * 2. Randomised triangle drawing to attempt to test all possible triangles */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "mersenne.hpp" #include <time.h> diff --git a/tests/general/two-sided-lighting-separate-specular.c b/tests/general/two-sided-lighting-separate-specular.c index 83a986f92..3aa386191 100644 --- a/tests/general/two-sided-lighting-separate-specular.c +++ b/tests/general/two-sided-lighting-separate-specular.c @@ -32,7 +32,7 @@ * Oct 2011 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, diff --git a/tests/general/two-sided-lighting.c b/tests/general/two-sided-lighting.c index 2cc3eeb19..3c0673d34 100644 --- a/tests/general/two-sided-lighting.c +++ b/tests/general/two-sided-lighting.c @@ -32,7 +32,7 @@ * Oct 2011 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c index cbe4d17c7..b5d6266cc 100644 --- a/tests/general/user-clip.c +++ b/tests/general/user-clip.c @@ -27,7 +27,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define BOX_SIZE 32 diff --git a/tests/general/vao-01.c b/tests/general/vao-01.c index f0c40ba0f..40de19ac1 100644 --- a/tests/general/vao-01.c +++ b/tests/general/vao-01.c @@ -36,7 +36,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/vao-02.c b/tests/general/vao-02.c index 95c26b5d1..eb8d44ed4 100644 --- a/tests/general/vao-02.c +++ b/tests/general/vao-02.c @@ -36,7 +36,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/vao-element-array-buffer.c b/tests/general/vao-element-array-buffer.c index 2f6724711..6e9f8c05a 100644 --- a/tests/general/vao-element-array-buffer.c +++ b/tests/general/vao-element-array-buffer.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/general/varray-disabled.c b/tests/general/varray-disabled.c index b5b403e7a..709c86ab7 100644 --- a/tests/general/varray-disabled.c +++ b/tests/general/varray-disabled.c @@ -34,7 +34,7 @@ * http://bugs.freedesktop.org/show_bug.cgi?id=19911 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/general/vbo-bufferdata.c b/tests/general/vbo-bufferdata.c index 0dba3df50..7d8bda154 100644 --- a/tests/general/vbo-bufferdata.c +++ b/tests/general/vbo-bufferdata.c @@ -25,7 +25,7 @@ * Marek Olšák <maraeo@gmail.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/vbo-map-remap.c b/tests/general/vbo-map-remap.c index 87e3350cc..870a4f2fa 100644 --- a/tests/general/vbo-map-remap.c +++ b/tests/general/vbo-map-remap.c @@ -24,7 +24,7 @@ * Ben Holmes <shranzel@hotmail.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/vbo-subdata-sync.c b/tests/general/vbo-subdata-sync.c index af2788cdd..b8d3d0852 100644 --- a/tests/general/vbo-subdata-sync.c +++ b/tests/general/vbo-subdata-sync.c @@ -30,7 +30,7 @@ * Test for synchronizing behavior of glBufferSubDataARB, bug #23857. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/vbo-subdata-zero.c b/tests/general/vbo-subdata-zero.c index cb4787338..e8149558f 100644 --- a/tests/general/vbo-subdata-zero.c +++ b/tests/general/vbo-subdata-zero.c @@ -24,7 +24,7 @@ * Ben Holmes <shranzel@hotmail.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/general/vs-point_size-zero.c b/tests/general/vs-point_size-zero.c index de8cc3709..c1f41754d 100644 --- a/tests/general/vs-point_size-zero.c +++ b/tests/general/vs-point_size-zero.c @@ -22,7 +22,7 @@ * SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/general/windowoverlap.c b/tests/general/windowoverlap.c index e0a8f474b..b35e1861e 100644 --- a/tests/general/windowoverlap.c +++ b/tests/general/windowoverlap.c @@ -30,7 +30,7 @@ * This test was prompted by http://bugs.freedesktop.org/show_bug.cgi?id=16123 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" static const int MainWidth = 128, MainHeight = 128; static const int SubX = 32, SubY = 32; diff --git a/tests/glean/glutils.cpp b/tests/glean/glutils.cpp index 8825aa209..a7b2542ed 100644 --- a/tests/glean/glutils.cpp +++ b/tests/glean/glutils.cpp @@ -43,7 +43,7 @@ #if defined(__AGL__) # include <cstring> #endif -#include "piglit-util.h" +#include "piglit-util-gl-common.h" namespace GLEAN { diff --git a/tests/gles2/gles2_shader_runner.c b/tests/gles2/gles2_shader_runner.c index 0d06ef8c8..fd5333ff9 100644 --- a/tests/gles2/gles2_shader_runner.c +++ b/tests/gles2/gles2_shader_runner.c @@ -32,7 +32,7 @@ #include <ctype.h> #include <string.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/glslparsertest/glslparsertest.c b/tests/glslparsertest/glslparsertest.c index fbd24226f..a7aa0bc0b 100644 --- a/tests/glslparsertest/glslparsertest.c +++ b/tests/glslparsertest/glslparsertest.c @@ -33,7 +33,7 @@ #include <errno.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/glx/glx-close-display.c b/tests/glx/glx-close-display.c index 81b50c0f2..478987223 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.h" +#include "piglit-util-gl-common.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 a777e05b7..dcd029cdd 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.h" +#include "piglit-util-gl-common.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 88e46a7d1..eb8557b51 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.h" +#include "piglit-util-gl-common.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 a4c4d509e..524ffe7d6 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.h" +#include "piglit-util-gl-common.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 9e2b4d8f0..dace55875 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.h" +#include "piglit-util-gl-common.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 d9c45c898..0cd2183cc 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.h" +#include "piglit-util-gl-common.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 896db1714..9e570aa5d 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.h" +#include "piglit-util-gl-common.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 1804e276b..cd5872ce0 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.h" +#include "piglit-util-gl-common.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 7bb0ae00b..0064251c2 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.h" +#include "piglit-util-gl-common.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 d33b7dc8a..59a886300 100644 --- a/tests/glx/glx-make-current.c +++ b/tests/glx/glx-make-current.c @@ -32,7 +32,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.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 8888fb498..41643437e 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.h" +#include "piglit-util-gl-common.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 c42611af7..0f3b428da 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.h" +#include "piglit-util-gl-common.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 033e147b0..2ab255179 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.h" +#include "piglit-util-gl-common.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 7e508f858..a6fc7d7fd 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.h" +#include "piglit-util-gl-common.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 2b655b7c9..a4fd736d1 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.h" +#include "piglit-util-gl-common.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 ab7a31d83..91a897b84 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.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "pthread.h" diff --git a/tests/glx/glx-multithread.c b/tests/glx/glx-multithread.c index ee522d831..ca1950599 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.h" +#include "piglit-util-gl-common.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 963a6c88c..0b3f1bdca 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.h" +#include "piglit-util-gl-common.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 70436cea2..bf1ce2a64 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.h" +#include "piglit-util-gl-common.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 0c2fec63e..a0dddfeee 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.h" +#include "piglit-util-gl-common.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 7ea3f6109..be45f8166 100644 --- a/tests/glx/glx-pixmap13-life.c +++ b/tests/glx/glx-pixmap13-life.c @@ -32,7 +32,7 @@ * fbconfigs. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.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 62ed47ea8..0fbec5e25 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.h" +#include "piglit-util-gl-common.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 583879a1d..7506d6572 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.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-swap-event.c b/tests/glx/glx-swap-event.c index 3304d2c41..8b2eb0c04 100644 --- a/tests/glx/glx-swap-event.c +++ b/tests/glx/glx-swap-event.c @@ -29,7 +29,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.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 122c7dcbf..c064a6c1b 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.h" +#include "piglit-util-gl-common.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 5994bff0d..df296265c 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.h" +#include "piglit-util-gl-common.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 0d2330243..a4dfb5cc9 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.h" +#include "piglit-util-gl-common.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 ef511e188..78cdf2107 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.h" +#include "piglit-util-gl-common.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 f2976ddc2..0f99974f0 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.h" +#include "piglit-util-gl-common.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 b0bd2d51d..ba147e2c0 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.h" +#include "piglit-util-gl-common.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 71beef0ef..ecbe5cd3e 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.h" +#include "piglit-util-gl-common.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 673ba3946..dc58bbf4d 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.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s0.c b/tests/hiz/hiz-depth-read-fbo-d24-s0.c index 05b8c9124..f8ef5dc05 100644 --- a/tests/hiz/hiz-depth-read-fbo-d24-s0.c +++ b/tests/hiz/hiz-depth-read-fbo-d24-s0.c @@ -30,7 +30,7 @@ * - GL_DEPTH_ATTACHMENT: GL_DEPTH_COMPONENT24 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s8.c b/tests/hiz/hiz-depth-read-fbo-d24-s8.c index b3b2c97d3..e56679370 100644 --- a/tests/hiz/hiz-depth-read-fbo-d24-s8.c +++ b/tests/hiz/hiz-depth-read-fbo-d24-s8.c @@ -31,7 +31,7 @@ * - GL_STENCIL_ATTACHMENT: GL_STENCIL_INDEX8 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-read-fbo-d24s8.c b/tests/hiz/hiz-depth-read-fbo-d24s8.c index fea0494fe..cf76234f4 100644 --- a/tests/hiz/hiz-depth-read-fbo-d24s8.c +++ b/tests/hiz/hiz-depth-read-fbo-d24s8.c @@ -30,7 +30,7 @@ * - GL_DEPTH_STENCIL_ATTACHMENT: GL_DEPTH24_STENCIL8 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-read-window-stencil0.c b/tests/hiz/hiz-depth-read-window-stencil0.c index a3d9ed200..97598c9d1 100644 --- a/tests/hiz/hiz-depth-read-window-stencil0.c +++ b/tests/hiz/hiz-depth-read-window-stencil0.c @@ -28,7 +28,7 @@ * framebuffer for which no stencil buffer was requested. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-read-window-stencil1.c b/tests/hiz/hiz-depth-read-window-stencil1.c index f8cdc9121..113b524d5 100644 --- a/tests/hiz/hiz-depth-read-window-stencil1.c +++ b/tests/hiz/hiz-depth-read-window-stencil1.c @@ -28,7 +28,7 @@ * framebuffer for which a stencil buffer was requested. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( 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 0834f6b47..6f980919a 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c @@ -38,7 +38,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( 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 1ebe606cd..53675f169 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c @@ -38,7 +38,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( 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 b972c7cd8..96ef6262d 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c @@ -39,7 +39,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c index e150a0a05..39eb50440 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c @@ -38,7 +38,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s0.c b/tests/hiz/hiz-depth-test-fbo-d24-s0.c index d5f5f7b6c..5ff30f978 100644 --- a/tests/hiz/hiz-depth-test-fbo-d24-s0.c +++ b/tests/hiz/hiz-depth-test-fbo-d24-s0.c @@ -35,7 +35,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s8.c b/tests/hiz/hiz-depth-test-fbo-d24-s8.c index 384d07493..b408b56c4 100644 --- a/tests/hiz/hiz-depth-test-fbo-d24-s8.c +++ b/tests/hiz/hiz-depth-test-fbo-d24-s8.c @@ -36,7 +36,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-test-fbo-d24s8.c b/tests/hiz/hiz-depth-test-fbo-d24s8.c index 5b4138e25..e424d513a 100644 --- a/tests/hiz/hiz-depth-test-fbo-d24s8.c +++ b/tests/hiz/hiz-depth-test-fbo-d24s8.c @@ -35,7 +35,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-test-window-stencil0.c b/tests/hiz/hiz-depth-test-window-stencil0.c index cef4d0d49..3ae9102c0 100644 --- a/tests/hiz/hiz-depth-test-window-stencil0.c +++ b/tests/hiz/hiz-depth-test-window-stencil0.c @@ -32,7 +32,7 @@ * framebuffer for which no stencil buffer was requested. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-depth-test-window-stencil1.c b/tests/hiz/hiz-depth-test-window-stencil1.c index eae0d1126..30c56e88e 100644 --- a/tests/hiz/hiz-depth-test-window-stencil1.c +++ b/tests/hiz/hiz-depth-test-window-stencil1.c @@ -32,7 +32,7 @@ * framebuffer with a stencilbuffer. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c index 90d86ac73..af7543943 100644 --- a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c +++ b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c @@ -36,7 +36,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c index f53ad7e49..a154a5628 100644 --- a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c +++ b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c @@ -37,7 +37,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-read-fbo-d24s8.c b/tests/hiz/hiz-stencil-read-fbo-d24s8.c index 967763ec4..4d845033c 100644 --- a/tests/hiz/hiz-stencil-read-fbo-d24s8.c +++ b/tests/hiz/hiz-stencil-read-fbo-d24s8.c @@ -36,7 +36,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-read-window-depth0.c b/tests/hiz/hiz-stencil-read-window-depth0.c index 44a4d899e..db4391b2e 100644 --- a/tests/hiz/hiz-stencil-read-window-depth0.c +++ b/tests/hiz/hiz-stencil-read-window-depth0.c @@ -34,7 +34,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-read-window-depth1.c b/tests/hiz/hiz-stencil-read-window-depth1.c index c3e9c04c5..49784bba5 100644 --- a/tests/hiz/hiz-stencil-read-window-depth1.c +++ b/tests/hiz/hiz-stencil-read-window-depth1.c @@ -34,7 +34,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c index 1e84966ae..5c9716ac1 100644 --- a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c +++ b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c @@ -35,7 +35,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c index 50cefbad0..8a31679ec 100644 --- a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c +++ b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c @@ -36,7 +36,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-stencil-test-fbo-d24s8.c index b5f8c196f..dd7e9d8bf 100644 --- a/tests/hiz/hiz-stencil-test-fbo-d24s8.c +++ b/tests/hiz/hiz-stencil-test-fbo-d24s8.c @@ -35,7 +35,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-test-window-depth0.c b/tests/hiz/hiz-stencil-test-window-depth0.c index 6189ef9c0..38d165dfe 100644 --- a/tests/hiz/hiz-stencil-test-window-depth0.c +++ b/tests/hiz/hiz-stencil-test-window-depth0.c @@ -32,7 +32,7 @@ * framebuffer for which no depth buffer was requested. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-stencil-test-window-depth1.c b/tests/hiz/hiz-stencil-test-window-depth1.c index 05561a0bd..62125406e 100644 --- a/tests/hiz/hiz-stencil-test-window-depth1.c +++ b/tests/hiz/hiz-stencil-test-window-depth1.c @@ -32,7 +32,7 @@ * framebuffer with a depth buffer. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/hiz/hiz-util.c b/tests/hiz/hiz-util.c index 978d4cfbd..22b198a59 100644 --- a/tests/hiz/hiz-util.c +++ b/tests/hiz/hiz-util.c @@ -31,7 +31,7 @@ */ #include <assert.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "hiz/hiz-util.h" #define hiz_probe_common(probe_func, expect) \ diff --git a/tests/hiz/hiz-util.h b/tests/hiz/hiz-util.h index a4caeb6a9..955cd8587 100644 --- a/tests/hiz/hiz-util.h +++ b/tests/hiz/hiz-util.h @@ -32,7 +32,7 @@ #pragma once -#include "piglit-util.h" +#include "piglit-util-gl-common.h" struct hiz_fbo_options { GLenum color_format; diff --git a/tests/mesa/util/readtex.c b/tests/mesa/util/readtex.c index cc5a3647a..a792992bd 100644 --- a/tests/mesa/util/readtex.c +++ b/tests/mesa/util/readtex.c @@ -7,7 +7,7 @@ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include <GL/gl.h> #include <GL/glu.h> #include <stdio.h> diff --git a/tests/shaders/activeprogram-bad-program.c b/tests/shaders/activeprogram-bad-program.c index 34c53d948..b9160b496 100644 --- a/tests/shaders/activeprogram-bad-program.c +++ b/tests/shaders/activeprogram-bad-program.c @@ -27,7 +27,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/activeprogram-get.c b/tests/shaders/activeprogram-get.c index c2299c37c..bdc701447 100644 --- a/tests/shaders/activeprogram-get.c +++ b/tests/shaders/activeprogram-get.c @@ -27,7 +27,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/ati-fs-bad-delete.c b/tests/shaders/ati-fs-bad-delete.c index 55422bc06..7197f5cf1 100644 --- a/tests/shaders/ati-fs-bad-delete.c +++ b/tests/shaders/ati-fs-bad-delete.c @@ -32,7 +32,7 @@ * shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/shaders/attribute0.c b/tests/shaders/attribute0.c index c04869903..d3bdf9c0c 100644 --- a/tests/shaders/attribute0.c +++ b/tests/shaders/attribute0.c @@ -27,7 +27,7 @@ * instead of using gl_Vertex. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/createshaderprogram-attached-shaders.c b/tests/shaders/createshaderprogram-attached-shaders.c index e8df1c8ec..a1a105f79 100644 --- a/tests/shaders/createshaderprogram-attached-shaders.c +++ b/tests/shaders/createshaderprogram-attached-shaders.c @@ -27,7 +27,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/createshaderprogram-bad-type.c b/tests/shaders/createshaderprogram-bad-type.c index c15505bf5..5eace0878 100644 --- a/tests/shaders/createshaderprogram-bad-type.c +++ b/tests/shaders/createshaderprogram-bad-type.c @@ -27,7 +27,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/fp-abs-01.c b/tests/shaders/fp-abs-01.c index 3f97da8ee..d8ee25510 100644 --- a/tests/shaders/fp-abs-01.c +++ b/tests/shaders/fp-abs-01.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEST_ROWS 1 diff --git a/tests/shaders/fp-abs-02.c b/tests/shaders/fp-abs-02.c index 320118306..83b9e91eb 100644 --- a/tests/shaders/fp-abs-02.c +++ b/tests/shaders/fp-abs-02.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEST_ROWS 1 diff --git a/tests/shaders/fp-condition_codes-01.c b/tests/shaders/fp-condition_codes-01.c index 87ced6265..ababf1489 100644 --- a/tests/shaders/fp-condition_codes-01.c +++ b/tests/shaders/fp-condition_codes-01.c @@ -29,7 +29,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" /* One for the reference square and one for each possible condition code. diff --git a/tests/shaders/fp-fog.c b/tests/shaders/fp-fog.c index 9f92eb121..d52927143 100644 --- a/tests/shaders/fp-fog.c +++ b/tests/shaders/fp-fog.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" static GLint prog = 0; diff --git a/tests/shaders/fp-formats.c b/tests/shaders/fp-formats.c index b1d44802a..63779ffbe 100644 --- a/tests/shaders/fp-formats.c +++ b/tests/shaders/fp-formats.c @@ -28,7 +28,7 @@ * (currently just alpha-only textures) */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/fp-fragment-position.c b/tests/shaders/fp-fragment-position.c index b4bec9ddb..a3cbd8918 100644 --- a/tests/shaders/fp-fragment-position.c +++ b/tests/shaders/fp-fragment-position.c @@ -25,7 +25,7 @@ * Test fragment.position. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/shaders/fp-incomplete-tex.c b/tests/shaders/fp-incomplete-tex.c index d95cc7c0d..665f7d739 100644 --- a/tests/shaders/fp-incomplete-tex.c +++ b/tests/shaders/fp-incomplete-tex.c @@ -26,7 +26,7 @@ * sampling an incomplete texture image yields (0,0,0,1). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/fp-indirections.c b/tests/shaders/fp-indirections.c index 03f9922ac..5f032b2f9 100644 --- a/tests/shaders/fp-indirections.c +++ b/tests/shaders/fp-indirections.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/fp-indirections2.c b/tests/shaders/fp-indirections2.c index fbabee45f..293c7c915 100644 --- a/tests/shaders/fp-indirections2.c +++ b/tests/shaders/fp-indirections2.c @@ -32,7 +32,7 @@ * indirection counts up to the reported native limit. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEXTURE_SIZE 32 /* Note: Hardcoded dependencies in texture_init and texture_follow */ diff --git a/tests/shaders/fp-kil.c b/tests/shaders/fp-kil.c index 31d2d0200..117114a2a 100644 --- a/tests/shaders/fp-kil.c +++ b/tests/shaders/fp-kil.c @@ -25,7 +25,7 @@ * Test KIL instruction. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/shaders/fp-lit-mask.c b/tests/shaders/fp-lit-mask.c index 4419ffaa9..217e0ee5b 100644 --- a/tests/shaders/fp-lit-mask.c +++ b/tests/shaders/fp-lit-mask.c @@ -25,7 +25,7 @@ * Test whether LIT honours the output mask. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/shaders/fp-lit-src-equals-dst.c b/tests/shaders/fp-lit-src-equals-dst.c index ea3e2add4..052d02e86 100644 --- a/tests/shaders/fp-lit-src-equals-dst.c +++ b/tests/shaders/fp-lit-src-equals-dst.c @@ -29,7 +29,7 @@ * (Heavily based on fp-lit-mask.c) */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/shaders/fp-long-alu.c b/tests/shaders/fp-long-alu.c index af799a84f..0f696f4e4 100644 --- a/tests/shaders/fp-long-alu.c +++ b/tests/shaders/fp-long-alu.c @@ -34,7 +34,7 @@ #include <stdlib.h> #include <string.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/fp-rfl.c b/tests/shaders/fp-rfl.c index 58e1ce699..4c6449253 100644 --- a/tests/shaders/fp-rfl.c +++ b/tests/shaders/fp-rfl.c @@ -30,7 +30,7 @@ #include <time.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define BOX_SIZE 8 diff --git a/tests/shaders/fp-set-01.c b/tests/shaders/fp-set-01.c index e405bc3bc..a5280e9f9 100644 --- a/tests/shaders/fp-set-01.c +++ b/tests/shaders/fp-set-01.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" /* One column for each possible combination of set-on results diff --git a/tests/shaders/fp-set-02.c b/tests/shaders/fp-set-02.c index 8147d675e..5b019b4a3 100644 --- a/tests/shaders/fp-set-02.c +++ b/tests/shaders/fp-set-02.c @@ -32,7 +32,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" typedef int (cmp_func)(float a, float b); diff --git a/tests/shaders/fp-unpack-01.c b/tests/shaders/fp-unpack-01.c index ffdfe5133..ef2e7d244 100644 --- a/tests/shaders/fp-unpack-01.c +++ b/tests/shaders/fp-unpack-01.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" /* There are 128 possible values. These values a distributed into 3 color diff --git a/tests/shaders/getuniform-01.c b/tests/shaders/getuniform-01.c index b50cf77b1..e435e4925 100644 --- a/tests/shaders/getuniform-01.c +++ b/tests/shaders/getuniform-01.c @@ -29,7 +29,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=29823 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/getuniform-02.c b/tests/shaders/getuniform-02.c index 3f0b8ddc4..d4b1b54c6 100644 --- a/tests/shaders/getuniform-02.c +++ b/tests/shaders/getuniform-02.c @@ -26,7 +26,7 @@ * Brian Paul, 27 May 2011 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c index 9c5e2495b..405ccddeb 100644 --- a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c +++ b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c @@ -31,7 +31,7 @@ * when the extension is exposed. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions.c b/tests/shaders/glsl-arb-fragment-coord-conventions.c index 99953b088..0f9e71ed6 100644 --- a/tests/shaders/glsl-arb-fragment-coord-conventions.c +++ b/tests/shaders/glsl-arb-fragment-coord-conventions.c @@ -31,7 +31,7 @@ * Test ARB_fragment_coord_conventions extension. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c index b4e4a2e0e..8e8cc3e3d 100644 --- a/tests/shaders/glsl-bindattriblocation.c +++ b/tests/shaders/glsl-bindattriblocation.c @@ -39,7 +39,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/shaders/glsl-bug-22603.c b/tests/shaders/glsl-bug-22603.c index e0c86c61a..7d44fbd8b 100644 --- a/tests/shaders/glsl-bug-22603.c +++ b/tests/shaders/glsl-bug-22603.c @@ -30,7 +30,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 800 /*window_width*/, diff --git a/tests/shaders/glsl-cos.c b/tests/shaders/glsl-cos.c index f0d9894c2..c7370fb9f 100644 --- a/tests/shaders/glsl-cos.c +++ b/tests/shaders/glsl-cos.c @@ -30,7 +30,7 @@ * Tests "cos" in both vertex and fragment shaders */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-deriv-varyings.c b/tests/shaders/glsl-deriv-varyings.c index 8b2e8478f..d707fff05 100644 --- a/tests/shaders/glsl-deriv-varyings.c +++ b/tests/shaders/glsl-deriv-varyings.c @@ -28,7 +28,7 @@ * on varying values. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" static void compileLinkProg(void); static void loadTex(void); diff --git a/tests/shaders/glsl-derivs.c b/tests/shaders/glsl-derivs.c index f2b0d533e..943af49a6 100644 --- a/tests/shaders/glsl-derivs.c +++ b/tests/shaders/glsl-derivs.c @@ -28,7 +28,7 @@ * on varyings after other math has been used on them. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" static void compileLinkProg(void); static void loadTex(void); diff --git a/tests/shaders/glsl-dlist-getattriblocation.c b/tests/shaders/glsl-dlist-getattriblocation.c index c81e55d55..0490bfbf7 100644 --- a/tests/shaders/glsl-dlist-getattriblocation.c +++ b/tests/shaders/glsl-dlist-getattriblocation.c @@ -30,7 +30,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/glsl-empty-vs-no-fs.c b/tests/shaders/glsl-empty-vs-no-fs.c index 361271185..4a6d19a1e 100644 --- a/tests/shaders/glsl-empty-vs-no-fs.c +++ b/tests/shaders/glsl-empty-vs-no-fs.c @@ -33,7 +33,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, diff --git a/tests/shaders/glsl-explicit-location-01.c b/tests/shaders/glsl-explicit-location-01.c index 0fc31371b..ce39e73a0 100644 --- a/tests/shaders/glsl-explicit-location-01.c +++ b/tests/shaders/glsl-explicit-location-01.c @@ -31,7 +31,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-explicit-location-02.c b/tests/shaders/glsl-explicit-location-02.c index 4bfb0b95f..28f357167 100644 --- a/tests/shaders/glsl-explicit-location-02.c +++ b/tests/shaders/glsl-explicit-location-02.c @@ -33,7 +33,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-explicit-location-03.c b/tests/shaders/glsl-explicit-location-03.c index 67c5afd8d..18be4c626 100644 --- a/tests/shaders/glsl-explicit-location-03.c +++ b/tests/shaders/glsl-explicit-location-03.c @@ -31,7 +31,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-explicit-location-04.c b/tests/shaders/glsl-explicit-location-04.c index fed35d6ed..c570f2616 100644 --- a/tests/shaders/glsl-explicit-location-04.c +++ b/tests/shaders/glsl-explicit-location-04.c @@ -28,7 +28,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-explicit-location-05.c b/tests/shaders/glsl-explicit-location-05.c index 02a1c7be8..60ba27da1 100644 --- a/tests/shaders/glsl-explicit-location-05.c +++ b/tests/shaders/glsl-explicit-location-05.c @@ -32,7 +32,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-bug25902.c b/tests/shaders/glsl-fs-bug25902.c index 13b8378ba..9efc59cf8 100644 --- a/tests/shaders/glsl-fs-bug25902.c +++ b/tests/shaders/glsl-fs-bug25902.c @@ -31,7 +31,7 @@ * in the GLSL path. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-color-matrix.c b/tests/shaders/glsl-fs-color-matrix.c index 12e9f69f9..a63a3e249 100644 --- a/tests/shaders/glsl-fs-color-matrix.c +++ b/tests/shaders/glsl-fs-color-matrix.c @@ -29,7 +29,7 @@ * the same texture coordinate), but it reproduces a bug in the Mesa i915 * driver. See Meego bug #13005 (https://bugs.meego.com/show_bug.cgi?id=13005). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-discard-02.c b/tests/shaders/glsl-fs-discard-02.c index 09b4f7085..0ae9a7fae 100644 --- a/tests/shaders/glsl-fs-discard-02.c +++ b/tests/shaders/glsl-fs-discard-02.c @@ -32,7 +32,7 @@ * Tests that discarding fragments doesn't let early depth writes through. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c index 3aeca0f69..cd8b863fc 100644 --- a/tests/shaders/glsl-fs-exp2.c +++ b/tests/shaders/glsl-fs-exp2.c @@ -30,7 +30,7 @@ * Tests that exp2 produces the expected output in a fragment shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-flat-color.c b/tests/shaders/glsl-fs-flat-color.c index af851b386..124ba1210 100644 --- a/tests/shaders/glsl-fs-flat-color.c +++ b/tests/shaders/glsl-fs-flat-color.c @@ -25,7 +25,7 @@ * \file glsl-fs-flat-color.c * Test that gl_Color works correctly with GL_SHADE_MODEL of GL_FLAT */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 30 /*window_width*/, diff --git a/tests/shaders/glsl-fs-fogcolor-statechange.c b/tests/shaders/glsl-fs-fogcolor-statechange.c index 3004591a5..2895d4a57 100644 --- a/tests/shaders/glsl-fs-fogcolor-statechange.c +++ b/tests/shaders/glsl-fs-fogcolor-statechange.c @@ -27,7 +27,7 @@ * execution. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c index 0a9e40e25..0c90dfe5a 100644 --- a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c +++ b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c @@ -33,7 +33,7 @@ * with an orthographic projection */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, diff --git a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c index 962a55fc4..4a5131f08 100644 --- a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c +++ b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c @@ -33,7 +33,7 @@ * with a perspective projection. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, diff --git a/tests/shaders/glsl-fs-fragcoord.c b/tests/shaders/glsl-fs-fragcoord.c index 8defe190a..928f2f084 100644 --- a/tests/shaders/glsl-fs-fragcoord.c +++ b/tests/shaders/glsl-fs-fragcoord.c @@ -30,7 +30,7 @@ * Tests that gl_FragCoord produces the expected output in a fragment shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, diff --git a/tests/shaders/glsl-fs-loop-nested.c b/tests/shaders/glsl-fs-loop-nested.c index 21fcbfa36..dc6deb19f 100644 --- a/tests/shaders/glsl-fs-loop-nested.c +++ b/tests/shaders/glsl-fs-loop-nested.c @@ -37,7 +37,7 @@ * This was conceived as a test case for freedesktop.org bug #25173. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-loop.c b/tests/shaders/glsl-fs-loop.c index 98f3fc3f9..79d2390db 100644 --- a/tests/shaders/glsl-fs-loop.c +++ b/tests/shaders/glsl-fs-loop.c @@ -37,7 +37,7 @@ * This was conceived as a test case for freedesktop.org bug #25173. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-mix-constant.c b/tests/shaders/glsl-fs-mix-constant.c index e690c3a56..1b41d3ca3 100644 --- a/tests/shaders/glsl-fs-mix-constant.c +++ b/tests/shaders/glsl-fs-mix-constant.c @@ -31,7 +31,7 @@ * all constant arguments. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-mix.c b/tests/shaders/glsl-fs-mix.c index e1b4350ad..472db6e9e 100644 --- a/tests/shaders/glsl-fs-mix.c +++ b/tests/shaders/glsl-fs-mix.c @@ -30,7 +30,7 @@ * Tests that mix() produces the expected output in a fragment shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c index 368627293..00b34557a 100644 --- a/tests/shaders/glsl-fs-pointcoord.c +++ b/tests/shaders/glsl-fs-pointcoord.c @@ -42,7 +42,7 @@ #include <errno.h> #include <sys/stat.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, diff --git a/tests/shaders/glsl-fs-raytrace-bug27060.c b/tests/shaders/glsl-fs-raytrace-bug27060.c index 0f718704e..a40f4e555 100644 --- a/tests/shaders/glsl-fs-raytrace-bug27060.c +++ b/tests/shaders/glsl-fs-raytrace-bug27060.c @@ -22,7 +22,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "glsl-fs-raytrace-bug27060.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/glsl-fs-sampler-numbering.c b/tests/shaders/glsl-fs-sampler-numbering.c index 0db99ff41..4f36e803a 100644 --- a/tests/shaders/glsl-fs-sampler-numbering.c +++ b/tests/shaders/glsl-fs-sampler-numbering.c @@ -31,7 +31,7 @@ * look up which gl texture unit is being used. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-shader-stencil-export.c b/tests/shaders/glsl-fs-shader-stencil-export.c index edc88ec75..94d8333b3 100644 --- a/tests/shaders/glsl-fs-shader-stencil-export.c +++ b/tests/shaders/glsl-fs-shader-stencil-export.c @@ -29,7 +29,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, diff --git a/tests/shaders/glsl-fs-sqrt-branch.c b/tests/shaders/glsl-fs-sqrt-branch.c index c900e5eed..e32c7e48c 100644 --- a/tests/shaders/glsl-fs-sqrt-branch.c +++ b/tests/shaders/glsl-fs-sqrt-branch.c @@ -31,7 +31,7 @@ * containing a conditional branch. Catches a bug in the 965 driver. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-sqrt-zero.c b/tests/shaders/glsl-fs-sqrt-zero.c index 61b6903bc..84e4186b7 100644 --- a/tests/shaders/glsl-fs-sqrt-zero.c +++ b/tests/shaders/glsl-fs-sqrt-zero.c @@ -30,7 +30,7 @@ * Tests that sqrt(0.0) in the FS produces 0.0. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-texture2drect.c b/tests/shaders/glsl-fs-texture2drect.c index 3f38f1a40..294388c25 100644 --- a/tests/shaders/glsl-fs-texture2drect.c +++ b/tests/shaders/glsl-fs-texture2drect.c @@ -30,7 +30,7 @@ * Tests that we can access rectangular textures in the fragment shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, diff --git a/tests/shaders/glsl-fs-texturecube-2.c b/tests/shaders/glsl-fs-texturecube-2.c index 9030227bc..bdf88c4b9 100644 --- a/tests/shaders/glsl-fs-texturecube-2.c +++ b/tests/shaders/glsl-fs-texturecube-2.c @@ -31,7 +31,7 @@ * sampling. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define SIZE 32 diff --git a/tests/shaders/glsl-fs-texturecube.c b/tests/shaders/glsl-fs-texturecube.c index c03f12e04..6c3bb3897 100644 --- a/tests/shaders/glsl-fs-texturecube.c +++ b/tests/shaders/glsl-fs-texturecube.c @@ -30,7 +30,7 @@ * Tests that we can access cubemaps in the fragment shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 120 /*window_width*/, diff --git a/tests/shaders/glsl-fs-textureenvcolor-statechange.c b/tests/shaders/glsl-fs-textureenvcolor-statechange.c index 4e60d742f..1a89805ce 100644 --- a/tests/shaders/glsl-fs-textureenvcolor-statechange.c +++ b/tests/shaders/glsl-fs-textureenvcolor-statechange.c @@ -27,7 +27,7 @@ * program execution. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-fs-user-varying-ff.c b/tests/shaders/glsl-fs-user-varying-ff.c index 24c60958f..e1143ab3a 100644 --- a/tests/shaders/glsl-fs-user-varying-ff.c +++ b/tests/shaders/glsl-fs-user-varying-ff.c @@ -27,7 +27,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/shaders/glsl-fwidth.c b/tests/shaders/glsl-fwidth.c index 0af9f07c2..75ed26ca0 100644 --- a/tests/shaders/glsl-fwidth.c +++ b/tests/shaders/glsl-fwidth.c @@ -28,7 +28,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/shaders/glsl-getactiveuniform-array-size.c b/tests/shaders/glsl-getactiveuniform-array-size.c index 29bc2e6fd..ddca59f87 100644 --- a/tests/shaders/glsl-getactiveuniform-array-size.c +++ b/tests/shaders/glsl-getactiveuniform-array-size.c @@ -30,7 +30,7 @@ * Tests that sqrt(0.0) in the VS produces 0.0. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-getactiveuniform-count.c b/tests/shaders/glsl-getactiveuniform-count.c index 31b1cf948..edf3c3b0a 100644 --- a/tests/shaders/glsl-getactiveuniform-count.c +++ b/tests/shaders/glsl-getactiveuniform-count.c @@ -31,7 +31,7 @@ * GL_ACTIVE_UNIFORMS. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-getactiveuniform-length.c b/tests/shaders/glsl-getactiveuniform-length.c index 37868ef5f..1217c89d4 100644 --- a/tests/shaders/glsl-getactiveuniform-length.c +++ b/tests/shaders/glsl-getactiveuniform-length.c @@ -31,7 +31,7 @@ * reflected in GL_ACTIVE_UNIFORM_MAX_LENGTH and the *length outvalue. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c index 2ad4da402..63ac35495 100644 --- a/tests/shaders/glsl-getattriblocation.c +++ b/tests/shaders/glsl-getattriblocation.c @@ -40,7 +40,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/shaders/glsl-invalid-asm-01.c b/tests/shaders/glsl-invalid-asm-01.c index ec7f74815..b658c6b1e 100644 --- a/tests/shaders/glsl-invalid-asm-01.c +++ b/tests/shaders/glsl-invalid-asm-01.c @@ -30,7 +30,7 @@ * (GL_ARB_vertex_program or GL_ARB_fragment_program) program. This test * attempts to reproduce this failure using an assembly fragment program. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" static const char vs_text[] = "void main() { gl_Position = gl_Vertex;" diff --git a/tests/shaders/glsl-invalid-asm-02.c b/tests/shaders/glsl-invalid-asm-02.c index e021ea7d7..313347dcd 100644 --- a/tests/shaders/glsl-invalid-asm-02.c +++ b/tests/shaders/glsl-invalid-asm-02.c @@ -30,7 +30,7 @@ * (GL_ARB_vertex_program or GL_ARB_fragment_program) program. This test * attempts to reproduce this failure using an assembly vertex program. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" static const char fs_text[] = "void main() { gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0); }"; diff --git a/tests/shaders/glsl-kwin-blur-1.c b/tests/shaders/glsl-kwin-blur-1.c index a05b44b61..32a6335b8 100644 --- a/tests/shaders/glsl-kwin-blur-1.c +++ b/tests/shaders/glsl-kwin-blur-1.c @@ -30,7 +30,7 @@ * with a 6 pixel blur radius (uses 7 varyings). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-kwin-blur-2.c b/tests/shaders/glsl-kwin-blur-2.c index 6600e8070..cbe3321d6 100644 --- a/tests/shaders/glsl-kwin-blur-2.c +++ b/tests/shaders/glsl-kwin-blur-2.c @@ -30,7 +30,7 @@ * with a 12 pixel blur radius (uses 13 varyings). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-light-model.c b/tests/shaders/glsl-light-model.c index 46e24951d..691f5bc74 100644 --- a/tests/shaders/glsl-light-model.c +++ b/tests/shaders/glsl-light-model.c @@ -34,7 +34,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-link-bug30552.c b/tests/shaders/glsl-link-bug30552.c index a32e64c9b..1997d931a 100644 --- a/tests/shaders/glsl-link-bug30552.c +++ b/tests/shaders/glsl-link-bug30552.c @@ -27,7 +27,7 @@ * \author Vinson Lee <vlee@vmware.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-link-bug38015.c b/tests/shaders/glsl-link-bug38015.c index 7adbc1912..d35c2a044 100644 --- a/tests/shaders/glsl-link-bug38015.c +++ b/tests/shaders/glsl-link-bug38015.c @@ -29,7 +29,7 @@ * \author Vinson Lee <vlee@vmware.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-link-empty-prog-01.c b/tests/shaders/glsl-link-empty-prog-01.c index 11bb65cc5..890fe8e17 100644 --- a/tests/shaders/glsl-link-empty-prog-01.c +++ b/tests/shaders/glsl-link-empty-prog-01.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/shaders/glsl-link-empty-prog-02.c b/tests/shaders/glsl-link-empty-prog-02.c index 266260c64..4ec119db1 100644 --- a/tests/shaders/glsl-link-empty-prog-02.c +++ b/tests/shaders/glsl-link-empty-prog-02.c @@ -53,7 +53,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/shaders/glsl-link-initializer-03.c b/tests/shaders/glsl-link-initializer-03.c index c440a114e..345d6c4cc 100644 --- a/tests/shaders/glsl-link-initializer-03.c +++ b/tests/shaders/glsl-link-initializer-03.c @@ -34,7 +34,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-link-test.c b/tests/shaders/glsl-link-test.c index e944cc7bf..f0f9e5534 100644 --- a/tests/shaders/glsl-link-test.c +++ b/tests/shaders/glsl-link-test.c @@ -28,7 +28,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-lod-bias.c b/tests/shaders/glsl-lod-bias.c index fdca8f8c1..f21327fcf 100644 --- a/tests/shaders/glsl-lod-bias.c +++ b/tests/shaders/glsl-lod-bias.c @@ -30,7 +30,7 @@ * that all the image are the same. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /* Pick the number of LODs to examine and the size of the texture so that the * smallest LOD is the one where each of the 4x4 tiles in the checkerboard diff --git a/tests/shaders/glsl-mat-attribute.c b/tests/shaders/glsl-mat-attribute.c index fc4edc3ff..25fe1e550 100644 --- a/tests/shaders/glsl-mat-attribute.c +++ b/tests/shaders/glsl-mat-attribute.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( 100 /*window_width*/, diff --git a/tests/shaders/glsl-max-varyings.c b/tests/shaders/glsl-max-varyings.c index 3bab559d4..bfec02828 100644 --- a/tests/shaders/glsl-max-varyings.c +++ b/tests/shaders/glsl-max-varyings.c @@ -31,7 +31,7 @@ * GL_MAX_VARYING_FLOATS / 4. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define MAX_VARYING 32 diff --git a/tests/shaders/glsl-max-vertex-attrib.c b/tests/shaders/glsl-max-vertex-attrib.c index 9e2ac7484..19b4b582b 100644 --- a/tests/shaders/glsl-max-vertex-attrib.c +++ b/tests/shaders/glsl-max-vertex-attrib.c @@ -34,7 +34,7 @@ * \author Tapani Pälli <tapani.palli@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/glsl-novertexdata.c b/tests/shaders/glsl-novertexdata.c index e8bbab4db..f4f319819 100644 --- a/tests/shaders/glsl-novertexdata.c +++ b/tests/shaders/glsl-novertexdata.c @@ -40,7 +40,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/shaders/glsl-orangebook-ch06-bump.c b/tests/shaders/glsl-orangebook-ch06-bump.c index a6e754056..59d513e24 100644 --- a/tests/shaders/glsl-orangebook-ch06-bump.c +++ b/tests/shaders/glsl-orangebook-ch06-bump.c @@ -31,7 +31,7 @@ * works correctly. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-preprocessor-comments.c b/tests/shaders/glsl-preprocessor-comments.c index 307642235..8fe34fb8a 100644 --- a/tests/shaders/glsl-preprocessor-comments.c +++ b/tests/shaders/glsl-preprocessor-comments.c @@ -34,7 +34,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=21707 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-reload-source.c b/tests/shaders/glsl-reload-source.c index 6251bc849..fb0802d30 100644 --- a/tests/shaders/glsl-reload-source.c +++ b/tests/shaders/glsl-reload-source.c @@ -32,7 +32,7 @@ #include <stdio.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/glsl-routing.c b/tests/shaders/glsl-routing.c index 402ca4b34..a04c6d390 100644 --- a/tests/shaders/glsl-routing.c +++ b/tests/shaders/glsl-routing.c @@ -32,7 +32,7 @@ * with emphasis on linking vertex and fragment shaders */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 260 /*window_width*/, diff --git a/tests/shaders/glsl-sin.c b/tests/shaders/glsl-sin.c index d4d438512..1df03af6b 100644 --- a/tests/shaders/glsl-sin.c +++ b/tests/shaders/glsl-sin.c @@ -30,7 +30,7 @@ * Tests "sin" in both vertex and fragment shaders */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-uniform-out-of-bounds.c b/tests/shaders/glsl-uniform-out-of-bounds.c index 56f1b747c..aa36c83fb 100644 --- a/tests/shaders/glsl-uniform-out-of-bounds.c +++ b/tests/shaders/glsl-uniform-out-of-bounds.c @@ -34,7 +34,7 @@ #include <stdarg.h> #include <stdio.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c index 6fbee5ce9..3a3ae2293 100644 --- a/tests/shaders/glsl-uniform-update.c +++ b/tests/shaders/glsl-uniform-update.c @@ -34,7 +34,7 @@ * catches a bug found in the 965 driver in an app I was writing. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c index 31986fedf..c629db256 100644 --- a/tests/shaders/glsl-unused-varying.c +++ b/tests/shaders/glsl-unused-varying.c @@ -34,7 +34,7 @@ * conditional in the fragment shader is required to trigger brw_wm_glsl.c. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-useprogram-displaylist.c b/tests/shaders/glsl-useprogram-displaylist.c index 79e222d7e..9d06b4811 100644 --- a/tests/shaders/glsl-useprogram-displaylist.c +++ b/tests/shaders/glsl-useprogram-displaylist.c @@ -29,7 +29,7 @@ * called within a display list. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-arrays.c b/tests/shaders/glsl-vs-arrays.c index b9aaf54e7..bf19dcaff 100644 --- a/tests/shaders/glsl-vs-arrays.c +++ b/tests/shaders/glsl-vs-arrays.c @@ -30,7 +30,7 @@ * Tests use of a temporary array as a source/destination in the VS. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-functions.c b/tests/shaders/glsl-vs-functions.c index 29fa255f7..c02ef541c 100644 --- a/tests/shaders/glsl-vs-functions.c +++ b/tests/shaders/glsl-vs-functions.c @@ -33,7 +33,7 @@ * with jumps to function calls being wrong. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-if-bool.c b/tests/shaders/glsl-vs-if-bool.c index 19c759203..dc1b2b110 100644 --- a/tests/shaders/glsl-vs-if-bool.c +++ b/tests/shaders/glsl-vs-if-bool.c @@ -30,7 +30,7 @@ * Tests that exp2 produces the expected output in a fragment shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-loop-nested.c b/tests/shaders/glsl-vs-loop-nested.c index d5d5f239e..6701a90ba 100644 --- a/tests/shaders/glsl-vs-loop-nested.c +++ b/tests/shaders/glsl-vs-loop-nested.c @@ -37,7 +37,7 @@ * This was conceived as a test case for freedesktop.org bug #25173. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c index a403bd0a9..70db940c0 100644 --- a/tests/shaders/glsl-vs-loop.c +++ b/tests/shaders/glsl-vs-loop.c @@ -37,7 +37,7 @@ * This was conceived as a test case for freedesktop.org bug #20171. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-mov-after-deref.c b/tests/shaders/glsl-vs-mov-after-deref.c index 5880752cc..8cf8ef0a4 100644 --- a/tests/shaders/glsl-vs-mov-after-deref.c +++ b/tests/shaders/glsl-vs-mov-after-deref.c @@ -31,7 +31,7 @@ * regression introduced in the Mesa optimizer. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-mvp-statechange.c b/tests/shaders/glsl-vs-mvp-statechange.c index 03c943baf..a2a299b8a 100644 --- a/tests/shaders/glsl-vs-mvp-statechange.c +++ b/tests/shaders/glsl-vs-mvp-statechange.c @@ -27,7 +27,7 @@ * reflected in program execution. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-normalscale.c b/tests/shaders/glsl-vs-normalscale.c index 92460554c..180f483b9 100644 --- a/tests/shaders/glsl-vs-normalscale.c +++ b/tests/shaders/glsl-vs-normalscale.c @@ -30,7 +30,7 @@ * Tests that gl_NormalScale provides a correct value. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-point-size.c b/tests/shaders/glsl-vs-point-size.c index bb4c705d5..7a020237d 100644 --- a/tests/shaders/glsl-vs-point-size.c +++ b/tests/shaders/glsl-vs-point-size.c @@ -33,7 +33,7 @@ * Bug #27250 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/shaders/glsl-vs-raytrace-bug26691.c b/tests/shaders/glsl-vs-raytrace-bug26691.c index 54eb350fd..77c3a638a 100644 --- a/tests/shaders/glsl-vs-raytrace-bug26691.c +++ b/tests/shaders/glsl-vs-raytrace-bug26691.c @@ -22,7 +22,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "glsl-vs-raytrace-bug26691.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/glsl-vs-sqrt-zero.c b/tests/shaders/glsl-vs-sqrt-zero.c index 9023aeabe..531cb883b 100644 --- a/tests/shaders/glsl-vs-sqrt-zero.c +++ b/tests/shaders/glsl-vs-sqrt-zero.c @@ -30,7 +30,7 @@ * Tests that sqrt(0.0) in the VS produces 0.0. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-statechange-1.c b/tests/shaders/glsl-vs-statechange-1.c index 76d1a5d34..84733e417 100644 --- a/tests/shaders/glsl-vs-statechange-1.c +++ b/tests/shaders/glsl-vs-statechange-1.c @@ -33,7 +33,7 @@ * per draw call. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, diff --git a/tests/shaders/glsl-vs-texturematrix-1.c b/tests/shaders/glsl-vs-texturematrix-1.c index 29f002f6e..b1ed0cd5e 100644 --- a/tests/shaders/glsl-vs-texturematrix-1.c +++ b/tests/shaders/glsl-vs-texturematrix-1.c @@ -30,7 +30,7 @@ * Tests that we can access gl_TextureMatrix[1] in the vertex shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-texturematrix-2.c b/tests/shaders/glsl-vs-texturematrix-2.c index ea85c7dbb..f0bfea90d 100644 --- a/tests/shaders/glsl-vs-texturematrix-2.c +++ b/tests/shaders/glsl-vs-texturematrix-2.c @@ -32,7 +32,7 @@ * Compared to glsl-vs-texturematrix-1, this uses varying access of the array. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/glsl-vs-user-varying-ff.c b/tests/shaders/glsl-vs-user-varying-ff.c index 4f5869336..3d91f9d93 100644 --- a/tests/shaders/glsl-vs-user-varying-ff.c +++ b/tests/shaders/glsl-vs-user-varying-ff.c @@ -27,7 +27,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/shaders/gpu_shader4_attribs.c b/tests/shaders/gpu_shader4_attribs.c index ce9475c6a..d9c0a9976 100644 --- a/tests/shaders/gpu_shader4_attribs.c +++ b/tests/shaders/gpu_shader4_attribs.c @@ -30,7 +30,7 @@ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/link-mismatch-layout-01.c b/tests/shaders/link-mismatch-layout-01.c index 9688dc8d8..9fff30f15 100644 --- a/tests/shaders/link-mismatch-layout-01.c +++ b/tests/shaders/link-mismatch-layout-01.c @@ -31,7 +31,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/link-mismatch-layout-02.c b/tests/shaders/link-mismatch-layout-02.c index 528a7d662..8e164e1f4 100644 --- a/tests/shaders/link-mismatch-layout-02.c +++ b/tests/shaders/link-mismatch-layout-02.c @@ -31,7 +31,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/link-mismatch-layout-03.c b/tests/shaders/link-mismatch-layout-03.c index b71f1722b..0cf215bff 100644 --- a/tests/shaders/link-mismatch-layout-03.c +++ b/tests/shaders/link-mismatch-layout-03.c @@ -31,7 +31,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/link-unresolved-function.c b/tests/shaders/link-unresolved-function.c index 32e1544a9..f6134e9aa 100644 --- a/tests/shaders/link-unresolved-function.c +++ b/tests/shaders/link-unresolved-function.c @@ -27,7 +27,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index d28da8507..694f2d239 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -36,7 +36,7 @@ #else #include <libgen.h> #endif -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-vbo.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/sso-simple.c b/tests/shaders/sso-simple.c index 783d4b7df..daa928918 100644 --- a/tests/shaders/sso-simple.c +++ b/tests/shaders/sso-simple.c @@ -27,7 +27,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, diff --git a/tests/shaders/sso-uniforms-01.c b/tests/shaders/sso-uniforms-01.c index 745122832..777c0d18a 100644 --- a/tests/shaders/sso-uniforms-01.c +++ b/tests/shaders/sso-uniforms-01.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/shaders/sso-uniforms-02.c b/tests/shaders/sso-uniforms-02.c index 791b5df2d..3f05d830d 100644 --- a/tests/shaders/sso-uniforms-02.c +++ b/tests/shaders/sso-uniforms-02.c @@ -31,7 +31,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/shaders/sso-user-varying-01.c b/tests/shaders/sso-user-varying-01.c index 62238e392..1fcbaea9f 100644 --- a/tests/shaders/sso-user-varying-01.c +++ b/tests/shaders/sso-user-varying-01.c @@ -27,7 +27,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/shaders/sso-user-varying-02.c b/tests/shaders/sso-user-varying-02.c index 4eceb021c..af01e4543 100644 --- a/tests/shaders/sso-user-varying-02.c +++ b/tests/shaders/sso-user-varying-02.c @@ -27,7 +27,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/shaders/trinity-fp1.c b/tests/shaders/trinity-fp1.c index 277450fd0..b52aa1f5d 100644 --- a/tests/shaders/trinity-fp1.c +++ b/tests/shaders/trinity-fp1.c @@ -26,7 +26,7 @@ * \sa http://www.mail-archive.com/dri-devel%40lists.sourceforge.net/msg30180.html */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/shaders/useprogram-flushverts-1.c b/tests/shaders/useprogram-flushverts-1.c index 5231c1bbf..8410894cf 100644 --- a/tests/shaders/useprogram-flushverts-1.c +++ b/tests/shaders/useprogram-flushverts-1.c @@ -31,7 +31,7 @@ * getting flushed correctly with the previous shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/useprogram-flushverts-2.c b/tests/shaders/useprogram-flushverts-2.c index 26fcc4340..eca9ba771 100644 --- a/tests/shaders/useprogram-flushverts-2.c +++ b/tests/shaders/useprogram-flushverts-2.c @@ -31,7 +31,7 @@ * getting flushed correctly with the previous shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/useprogram-inside-begin.c b/tests/shaders/useprogram-inside-begin.c index 26a705be0..21d309db0 100644 --- a/tests/shaders/useprogram-inside-begin.c +++ b/tests/shaders/useprogram-inside-begin.c @@ -27,7 +27,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/useprogram-refcount-1.c b/tests/shaders/useprogram-refcount-1.c index 1aa4d0407..8d6cef8ef 100644 --- a/tests/shaders/useprogram-refcount-1.c +++ b/tests/shaders/useprogram-refcount-1.c @@ -34,7 +34,7 @@ * Bug #31194 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/useshaderprogram-bad-program.c b/tests/shaders/useshaderprogram-bad-program.c index cd26e799a..294357bc9 100644 --- a/tests/shaders/useshaderprogram-bad-program.c +++ b/tests/shaders/useshaderprogram-bad-program.c @@ -27,7 +27,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/useshaderprogram-bad-type.c b/tests/shaders/useshaderprogram-bad-type.c index 5486aef5f..226b7a2a2 100644 --- a/tests/shaders/useshaderprogram-bad-type.c +++ b/tests/shaders/useshaderprogram-bad-type.c @@ -27,7 +27,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/useshaderprogram-flushverts-1.c b/tests/shaders/useshaderprogram-flushverts-1.c index c8983d018..95388869b 100644 --- a/tests/shaders/useshaderprogram-flushverts-1.c +++ b/tests/shaders/useshaderprogram-flushverts-1.c @@ -31,7 +31,7 @@ * vertices getting flushed correctly with the previous shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/vp-address-01.c b/tests/shaders/vp-address-01.c index 9e37496b4..7211b983e 100644 --- a/tests/shaders/vp-address-01.c +++ b/tests/shaders/vp-address-01.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" static const GLfloat attrib[] = { diff --git a/tests/shaders/vp-address-02.c b/tests/shaders/vp-address-02.c index cdd7dfd47..98712c9cc 100644 --- a/tests/shaders/vp-address-02.c +++ b/tests/shaders/vp-address-02.c @@ -33,7 +33,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" static const GLfloat attrib[] = { diff --git a/tests/shaders/vp-address-03.c b/tests/shaders/vp-address-03.c index 2a09b5534..2606fa76c 100644 --- a/tests/shaders/vp-address-03.c +++ b/tests/shaders/vp-address-03.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEST_ROWS 1 diff --git a/tests/shaders/vp-address-04.c b/tests/shaders/vp-address-04.c index 26c39be93..b756bcfb5 100644 --- a/tests/shaders/vp-address-04.c +++ b/tests/shaders/vp-address-04.c @@ -33,7 +33,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" static const GLfloat attrib[] = { diff --git a/tests/shaders/vp-address-05.c b/tests/shaders/vp-address-05.c index 4b9cc3f38..bdb0c8984 100644 --- a/tests/shaders/vp-address-05.c +++ b/tests/shaders/vp-address-05.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEST_ROWS 1 diff --git a/tests/shaders/vp-address-06.c b/tests/shaders/vp-address-06.c index 1ccfec209..ef058bacb 100644 --- a/tests/shaders/vp-address-06.c +++ b/tests/shaders/vp-address-06.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEST_ROWS 1 diff --git a/tests/shaders/vp-bad-program.c b/tests/shaders/vp-bad-program.c index 757ea131c..c73982b2e 100644 --- a/tests/shaders/vp-bad-program.c +++ b/tests/shaders/vp-bad-program.c @@ -34,7 +34,7 @@ * Wine likes to do that to us to see how strict we are on the VP language. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/shaders/vp-clipdistance-01.c b/tests/shaders/vp-clipdistance-01.c index 07e66641c..461024036 100644 --- a/tests/shaders/vp-clipdistance-01.c +++ b/tests/shaders/vp-clipdistance-01.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEST_ROWS 1 diff --git a/tests/shaders/vp-clipdistance-02.c b/tests/shaders/vp-clipdistance-02.c index 7db65a9d6..a911dda2c 100644 --- a/tests/shaders/vp-clipdistance-02.c +++ b/tests/shaders/vp-clipdistance-02.c @@ -32,7 +32,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEST_ROWS 1 diff --git a/tests/shaders/vp-clipdistance-03.c b/tests/shaders/vp-clipdistance-03.c index 16dff27cf..74e36ef80 100644 --- a/tests/shaders/vp-clipdistance-03.c +++ b/tests/shaders/vp-clipdistance-03.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEST_ROWS 1 diff --git a/tests/shaders/vp-clipdistance-04.c b/tests/shaders/vp-clipdistance-04.c index 4946e144f..5bca302e0 100644 --- a/tests/shaders/vp-clipdistance-04.c +++ b/tests/shaders/vp-clipdistance-04.c @@ -32,7 +32,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define TEST_ROWS 1 diff --git a/tests/shaders/vp-combined-image-units.c b/tests/shaders/vp-combined-image-units.c index 20beb9934..3cbb41bd8 100644 --- a/tests/shaders/vp-combined-image-units.c +++ b/tests/shaders/vp-combined-image-units.c @@ -32,7 +32,7 @@ * by bug #25518. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/shaders/vp-ignore-input.c b/tests/shaders/vp-ignore-input.c index 4f0b8cd82..b5cc48f38 100644 --- a/tests/shaders/vp-ignore-input.c +++ b/tests/shaders/vp-ignore-input.c @@ -28,7 +28,7 @@ * writes a constant to gl_Position. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/shaders/vp-max-array.c b/tests/shaders/vp-max-array.c index dfbbd1080..8dc3880ab 100644 --- a/tests/shaders/vp-max-array.c +++ b/tests/shaders/vp-max-array.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/shaders/vpfp-generic.cpp b/tests/shaders/vpfp-generic.cpp index b24559d5e..a0175b2ac 100644 --- a/tests/shaders/vpfp-generic.cpp +++ b/tests/shaders/vpfp-generic.cpp @@ -63,7 +63,7 @@ #include <vector> extern "C" { -#include "piglit-util.h" +#include "piglit-util-gl-common.h" } using namespace std; diff --git a/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c b/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c index b2ddce5db..7ec34a4b8 100644 --- a/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c +++ b/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c index 79f39538b..33987b145 100644 --- a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c +++ b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c @@ -27,7 +27,7 @@ * * \author Ian Romanick + Dave Airlie (extended tests) */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/api/blend-api.c b/tests/spec/arb_blend_func_extended/api/blend-api.c index 37d17f8c6..c7933b83e 100644 --- a/tests/spec/arb_blend_func_extended/api/blend-api.c +++ b/tests/spec/arb_blend_func_extended/api/blend-api.c @@ -26,7 +26,7 @@ * \author Dave Airlie * Test additions to blending API from ARB_blend_func_extended */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/api/error-at-begin.c b/tests/spec/arb_blend_func_extended/api/error-at-begin.c index c3748f8dc..6bdbb8ec2 100644 --- a/tests/spec/arb_blend_func_extended/api/error-at-begin.c +++ b/tests/spec/arb_blend_func_extended/api/error-at-begin.c @@ -32,7 +32,7 @@ * ONE_MINUS_SRC1_ALPHA), and a framebuffer is bound that has more than * the value of MAX_DUAL_SOURCE_DRAW_BUFFERS-1 active color attachements." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c index edd4ad7f6..733404c63 100644 --- a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c +++ b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c @@ -26,7 +26,7 @@ * \author Dave Airlie * heavily inspired by getfragdatalocation.c from Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c index 1f8027295..bbb3d83a0 100644 --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c @@ -35,7 +35,7 @@ * so just have the initial test validate that */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c index 041c13b47..558b3c301 100644 --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c @@ -35,7 +35,7 @@ * so just have the initial test validate that */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_color_buffer_float/common.h b/tests/spec/arb_color_buffer_float/common.h index e0998e7c4..f71077c04 100644 --- a/tests/spec/arb_color_buffer_float/common.h +++ b/tests/spec/arb_color_buffer_float/common.h @@ -30,7 +30,7 @@ * different ways! */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN(128 /*window_width*/, 128 /*window_height*/, diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c index 6115dac6c..f3dd62d44 100644 --- a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c +++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define COPY_BUFFER_SIZE (4<<20) uint8_t src_data[COPY_BUFFER_SIZE]; diff --git a/tests/spec/arb_copy_buffer/copybuffersubdata.c b/tests/spec/arb_copy_buffer/copybuffersubdata.c index 7d41222b5..5f61a39eb 100644 --- a/tests/spec/arb_copy_buffer/copybuffersubdata.c +++ b/tests/spec/arb_copy_buffer/copybuffersubdata.c @@ -28,7 +28,7 @@ * Jan 2012 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/dlist.c b/tests/spec/arb_copy_buffer/dlist.c index 34bf3dd09..288f22972 100644 --- a/tests/spec/arb_copy_buffer/dlist.c +++ b/tests/spec/arb_copy_buffer/dlist.c @@ -31,7 +31,7 @@ * CopyBufferSubData" */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/get.c b/tests/spec/arb_copy_buffer/get.c index 8ec966aa9..099846ea2 100644 --- a/tests/spec/arb_copy_buffer/get.c +++ b/tests/spec/arb_copy_buffer/get.c @@ -26,7 +26,7 @@ * Tests that the getters for the new binding points in GL_ARB_copy_buffer work. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/negative-bound-zero.c b/tests/spec/arb_copy_buffer/negative-bound-zero.c index 91fb75343..0746b90ef 100644 --- a/tests/spec/arb_copy_buffer/negative-bound-zero.c +++ b/tests/spec/arb_copy_buffer/negative-bound-zero.c @@ -29,7 +29,7 @@ * readtarget or writetarget." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/negative-bounds.c b/tests/spec/arb_copy_buffer/negative-bounds.c index 605702f8f..c4208e770 100644 --- a/tests/spec/arb_copy_buffer/negative-bounds.c +++ b/tests/spec/arb_copy_buffer/negative-bounds.c @@ -35,7 +35,7 @@ * error checking doesn't fail copies within the bounds. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/negative-mapped.c b/tests/spec/arb_copy_buffer/negative-mapped.c index 1cc296a1e..fe65338d9 100644 --- a/tests/spec/arb_copy_buffer/negative-mapped.c +++ b/tests/spec/arb_copy_buffer/negative-mapped.c @@ -29,7 +29,7 @@ * bound to either readtarget or writetarget are mapped." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/overlap.c b/tests/spec/arb_copy_buffer/overlap.c index 62b62f8e3..b61688b5d 100644 --- a/tests/spec/arb_copy_buffer/overlap.c +++ b/tests/spec/arb_copy_buffer/overlap.c @@ -34,7 +34,7 @@ * overlap, but with one buffer being both src and dst. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/targets.c b/tests/spec/arb_copy_buffer/targets.c index 7378ea642..3a6025fdd 100644 --- a/tests/spec/arb_copy_buffer/targets.c +++ b/tests/spec/arb_copy_buffer/targets.c @@ -45,7 +45,7 @@ * that copies work for them. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_debug_output/api_error.c b/tests/spec/arb_debug_output/api_error.c index d2517502e..3ea9634fa 100644 --- a/tests/spec/arb_debug_output/api_error.c +++ b/tests/spec/arb_debug_output/api_error.c @@ -22,7 +22,7 @@ * SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_draw_buffers/state_change.c b/tests/spec/arb_draw_buffers/state_change.c index c4960b1cc..17a8a13a5 100644 --- a/tests/spec/arb_draw_buffers/state_change.c +++ b/tests/spec/arb_draw_buffers/state_change.c @@ -29,7 +29,7 @@ * It would then fail to enable the second buffer again because it was already * pointing to the new buffer. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c b/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c index 88158ef0e..11c0df56f 100644 --- a/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c +++ b/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist-arb_draw_instanced.c diff --git a/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c b/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c index 41c3f5c74..870abcc2a 100644 --- a/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c +++ b/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c @@ -33,7 +33,7 @@ * color modifier and an y offset. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 300 /*window_width*/, diff --git a/tests/spec/arb_draw_instanced/execution/dlist.c b/tests/spec/arb_draw_instanced/execution/dlist.c index bdc9940ad..331f93f70 100644 --- a/tests/spec/arb_draw_instanced/execution/dlist.c +++ b/tests/spec/arb_draw_instanced/execution/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist.c diff --git a/tests/spec/arb_draw_instanced/execution/elements.c b/tests/spec/arb_draw_instanced/execution/elements.c index 3a400b2e6..daa71d9fe 100644 --- a/tests/spec/arb_draw_instanced/execution/elements.c +++ b/tests/spec/arb_draw_instanced/execution/elements.c @@ -31,7 +31,7 @@ * glDrawArraysInstancedARB(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, diff --git a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c index 96abaf620..de8e8a2ce 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c +++ b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-arrays-first-negative.c diff --git a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c index 42707c0b3..878bbd4c2 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c +++ b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-elements-type.c diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c index 9b2c34b38..ec1e524a7 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c @@ -27,7 +27,7 @@ * glDepthRange) and that it works. Based on general/depth-clamp-range.c. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c index b61a33b94..b796ba9c4 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c @@ -28,7 +28,7 @@ * INCOMPLETE_READ_BUFFER with ARB_ES2_compatibility. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c index db6832196..7130aaa5b 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c @@ -22,7 +22,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include <stdarg.h> PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c index cea73631c..5767867f2 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c @@ -33,7 +33,7 @@ * if \c GL_OES_fragment_precision_high is supported. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c index da04067bf..7c3204685 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c @@ -26,7 +26,7 @@ * Tests that MAX_*_VECTORS = MAX_*_COMPONENTS / 4. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c index 6996117d2..2ed7dd7d1 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c @@ -31,7 +31,7 @@ * glReleaseShaderCompiler(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c index 09eecd5f7..b9fb9898e 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c @@ -27,7 +27,7 @@ * SHADER_COMPILER being present. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c index 1ed379c90..6247e9d8f 100644 --- a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c +++ b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c @@ -54,7 +54,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c index 70c9d6c71..e9df4be05 100644 --- a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c +++ b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c @@ -41,7 +41,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_fragment_program/minmax.c b/tests/spec/arb_fragment_program/minmax.c index b059408ed..dbb9b3e77 100644 --- a/tests/spec/arb_fragment_program/minmax.c +++ b/tests/spec/arb_fragment_program/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum values in GL_ARB_fragment_program. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c index be87270dd..3b9bf1bed 100644 --- a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c +++ b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c @@ -29,7 +29,7 @@ */ #include <stdio.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "../../fbo/fbo-formats.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c index 681d941e1..e9de8a422 100644 --- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c +++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c @@ -29,7 +29,7 @@ */ #include <stdio.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c index 20fe7d4cb..5c69898db 100644 --- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c +++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c @@ -30,7 +30,7 @@ */ #include <stdio.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/spec/arb_instanced_arrays/instanced_arrays.c b/tests/spec/arb_instanced_arrays/instanced_arrays.c index ab6ff7143..3d1a1b15e 100644 --- a/tests/spec/arb_instanced_arrays/instanced_arrays.c +++ b/tests/spec/arb_instanced_arrays/instanced_arrays.c @@ -27,7 +27,7 @@ * Tests GL_ARB_instanced_arrays */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c index aebed744d..1e6f69b2c 100644 --- a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c +++ b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c @@ -26,7 +26,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c index 643cda3ca..b8a89b0e2 100644 --- a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c +++ b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_multisample/beginend.c b/tests/spec/arb_multisample/beginend.c index abe40a459..bdcc02e8c 100644 --- a/tests/spec/arb_multisample/beginend.c +++ b/tests/spec/arb_multisample/beginend.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file beginend.c diff --git a/tests/spec/arb_multisample/pushpop.c b/tests/spec/arb_multisample/pushpop.c index ba1b8c34a..35aa605a8 100644 --- a/tests/spec/arb_multisample/pushpop.c +++ b/tests/spec/arb_multisample/pushpop.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file pushpop.c diff --git a/tests/spec/arb_robustness/client-mem-bounds.c b/tests/spec/arb_robustness/client-mem-bounds.c index d15808619..393772256 100644 --- a/tests/spec/arb_robustness/client-mem-bounds.c +++ b/tests/spec/arb_robustness/client-mem-bounds.c @@ -21,7 +21,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/spec/arb_robustness/draw-vbo-bounds.c b/tests/spec/arb_robustness/draw-vbo-bounds.c index 90f6b0372..8256f4e41 100644 --- a/tests/spec/arb_robustness/draw-vbo-bounds.c +++ b/tests/spec/arb_robustness/draw-vbo-bounds.c @@ -45,7 +45,7 @@ * - provide a command line option to actually enable ARB_robustness */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/spec/arb_sampler_objects/sampler-incomplete.c b/tests/spec/arb_sampler_objects/sampler-incomplete.c index 32dd737f9..75d195538 100644 --- a/tests/spec/arb_sampler_objects/sampler-incomplete.c +++ b/tests/spec/arb_sampler_objects/sampler-incomplete.c @@ -33,7 +33,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_sampler_objects/sampler-objects.c b/tests/spec/arb_sampler_objects/sampler-objects.c index 053c2bc55..86679db9f 100644 --- a/tests/spec/arb_sampler_objects/sampler-objects.c +++ b/tests/spec/arb_sampler_objects/sampler-objects.c @@ -30,7 +30,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c index 7ef228fb0..182ab2d6f 100644 --- a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c +++ b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c index bf7c5f701..d5a675fb1 100644 --- a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c +++ b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c @@ -31,7 +31,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_shader_objects/clear-with-deleted.c b/tests/spec/arb_shader_objects/clear-with-deleted.c index 756523750..833dcc8a2 100644 --- a/tests/spec/arb_shader_objects/clear-with-deleted.c +++ b/tests/spec/arb_shader_objects/clear-with-deleted.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file clear-with-deleted.c diff --git a/tests/spec/arb_shader_objects/delete-repeat.c b/tests/spec/arb_shader_objects/delete-repeat.c index b00c9dafd..f4497de2b 100644 --- a/tests/spec/arb_shader_objects/delete-repeat.c +++ b/tests/spec/arb_shader_objects/delete-repeat.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file delete-repeat.c diff --git a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c index ba9e5f961..317717028 100644 --- a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c +++ b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file getactiveuniform-beginend.c diff --git a/tests/spec/arb_shader_objects/getuniform.c b/tests/spec/arb_shader_objects/getuniform.c index be33f211f..a69a2589e 100644 --- a/tests/spec/arb_shader_objects/getuniform.c +++ b/tests/spec/arb_shader_objects/getuniform.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file getuniform.c diff --git a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c index faf19503f..b4abe3cd7 100644 --- a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c +++ b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c @@ -29,7 +29,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_shader_texture_lod/execution/texgrad.c b/tests/spec/arb_shader_texture_lod/execution/texgrad.c index 0c23ef25d..629b0b527 100644 --- a/tests/spec/arb_shader_texture_lod/execution/texgrad.c +++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c @@ -29,7 +29,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, diff --git a/tests/spec/arb_sync/repeat-wait.c b/tests/spec/arb_sync/repeat-wait.c index 3e29e95f9..a812824bf 100644 --- a/tests/spec/arb_sync/repeat-wait.c +++ b/tests/spec/arb_sync/repeat-wait.c @@ -41,7 +41,7 @@ * driver on a later ClientWaitSync. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_sync/timeout-zero.c b/tests/spec/arb_sync/timeout-zero.c index 751b298cd..4e162ba9f 100644 --- a/tests/spec/arb_sync/timeout-zero.c +++ b/tests/spec/arb_sync/timeout-zero.c @@ -36,7 +36,7 @@ * performed." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/dlist.c b/tests/spec/arb_texture_buffer_object/dlist.c index 24b15bce8..dd8e62df3 100644 --- a/tests/spec/arb_texture_buffer_object/dlist.c +++ b/tests/spec/arb_texture_buffer_object/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist.c diff --git a/tests/spec/arb_texture_buffer_object/formats.c b/tests/spec/arb_texture_buffer_object/formats.c index 19fbb9d40..8e2511b99 100644 --- a/tests/spec/arb_texture_buffer_object/formats.c +++ b/tests/spec/arb_texture_buffer_object/formats.c @@ -26,7 +26,7 @@ */ #define _GNU_SOURCE -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/get.c b/tests/spec/arb_texture_buffer_object/get.c index ad60975f1..ffbc4e131 100644 --- a/tests/spec/arb_texture_buffer_object/get.c +++ b/tests/spec/arb_texture_buffer_object/get.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file get.c diff --git a/tests/spec/arb_texture_buffer_object/minmax.c b/tests/spec/arb_texture_buffer_object/minmax.c index 677da726a..22399c42a 100644 --- a/tests/spec/arb_texture_buffer_object/minmax.c +++ b/tests/spec/arb_texture_buffer_object/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum value in the GL_ARB_texture_buffer_object spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c index a576c8800..c1a2f748c 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c @@ -28,7 +28,7 @@ * buffer object, the error INVALID_OPERATION is generated." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-format.c b/tests/spec/arb_texture_buffer_object/negative-bad-format.c index e002fd3df..601712170 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-format.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-format.c @@ -28,7 +28,7 @@ * of the sized internal formats found in Table X.1." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-target.c b/tests/spec/arb_texture_buffer_object/negative-bad-target.c index 47e1fbfe6..3885cd712 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-target.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-target.c @@ -27,7 +27,7 @@ * "<target> must be TEXTURE_BUFFER_ARB" */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/unused-name.c b/tests/spec/arb_texture_buffer_object/unused-name.c index 117a4e73b..9f0b77a46 100644 --- a/tests/spec/arb_texture_buffer_object/unused-name.c +++ b/tests/spec/arb_texture_buffer_object/unused-name.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file unused-name.c diff --git a/tests/spec/arb_texture_compression/internal-format-query.c b/tests/spec/arb_texture_compression/internal-format-query.c index ff7ef0243..9f29f6ed1 100644 --- a/tests/spec/arb_texture_compression/internal-format-query.c +++ b/tests/spec/arb_texture_compression/internal-format-query.c @@ -68,7 +68,7 @@ * and the texture image will not be compressed by the GL." */ #include <stdarg.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_texture_compression/invalid-formats.c b/tests/spec/arb_texture_compression/invalid-formats.c index 561fa1f8a..7023aa8ba 100644 --- a/tests/spec/arb_texture_compression/invalid-formats.c +++ b/tests/spec/arb_texture_compression/invalid-formats.c @@ -37,7 +37,7 @@ * All texture compression extensions have taken this to mean only linear RGB * and linear RGBA formats should be exposed. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_texture_float/texture-float-formats.c b/tests/spec/arb_texture_float/texture-float-formats.c index 326326a32..978ef815c 100644 --- a/tests/spec/arb_texture_float/texture-float-formats.c +++ b/tests/spec/arb_texture_float/texture-float-formats.c @@ -26,7 +26,7 @@ * Tests GL_ARB_texture_float floating point formats */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_texture_storage/texture-storage.c b/tests/spec/arb_texture_storage/texture-storage.c index 0f1612377..959d13982 100644 --- a/tests/spec/arb_texture_storage/texture-storage.c +++ b/tests/spec/arb_texture_storage/texture-storage.c @@ -28,7 +28,7 @@ * Brian Paul */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_transform_feedback2/draw-auto.c b/tests/spec/arb_transform_feedback2/draw-auto.c index 18ab469a1..06f55ca62 100644 --- a/tests/spec/arb_transform_feedback2/draw-auto.c +++ b/tests/spec/arb_transform_feedback2/draw-auto.c @@ -27,7 +27,7 @@ * Test Pause, Resume, and DrawTF. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c index 3a4dcf29b..c64395ee8 100644 --- a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c +++ b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c @@ -27,7 +27,7 @@ * binding point. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/buffer-targets.c b/tests/spec/arb_uniform_buffer_object/buffer-targets.c index a99349175..556223a27 100644 --- a/tests/spec/arb_uniform_buffer_object/buffer-targets.c +++ b/tests/spec/arb_uniform_buffer_object/buffer-targets.c @@ -35,7 +35,7 @@ * UNIFORM_BUFFER" */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/getintegeri_v.c b/tests/spec/arb_uniform_buffer_object/getintegeri_v.c index 1beca4cb9..852a14eb6 100644 --- a/tests/spec/arb_uniform_buffer_object/getintegeri_v.c +++ b/tests/spec/arb_uniform_buffer_object/getintegeri_v.c @@ -35,7 +35,7 @@ * is bound to <index>, -1 is returned." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c b/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c index 772ceb285..a7cb57bff 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c @@ -28,7 +28,7 @@ * for active blocks. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/getuniformindices.c b/tests/spec/arb_uniform_buffer_object/getuniformindices.c index e9e31edcd..9819c6dad 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformindices.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformindices.c @@ -27,7 +27,7 @@ * and consecutive indices starting from 0. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/getuniformlocation.c b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c index 574524419..8f0245d38 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformlocation.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c @@ -37,7 +37,7 @@ * <name> is associated with a named uniform block..." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/layout-std140.c b/tests/spec/arb_uniform_buffer_object/layout-std140.c index 5f7f26dd3..429b5740b 100644 --- a/tests/spec/arb_uniform_buffer_object/layout-std140.c +++ b/tests/spec/arb_uniform_buffer_object/layout-std140.c @@ -34,7 +34,7 @@ * http://www.opengl.org/registry/specs/ARB/uniform_buffer_object.txt */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/minmax.c b/tests/spec/arb_uniform_buffer_object/minmax.c index 0f4bd402d..590f2a7c1 100644 --- a/tests/spec/arb_uniform_buffer_object/minmax.c +++ b/tests/spec/arb_uniform_buffer_object/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.1 spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c index c85f5c35c..185c373e0 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c @@ -26,7 +26,7 @@ * Tests for errors when binding a bad buffer object name. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c index 5d7f5b4fc..8f7c4a1e1 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c @@ -27,7 +27,7 @@ * buffer binding point. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c index 5edcabc8f..e884040d1 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c @@ -26,7 +26,7 @@ * Tests for errors when binding with a bad target. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c b/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c index 549abeaea..cb5ecdea4 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c @@ -39,7 +39,7 @@ * <size> equal to the size of <buffer>." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c index d5afd1b83..3e0c9396c 100644 --- a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c +++ b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c @@ -28,7 +28,7 @@ * to access the new vertex data. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c b/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c index c1ba6f484..0b46cafaf 100644 --- a/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c +++ b/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c @@ -30,7 +30,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=37934 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_vertex_program/getenv4d-with-error.c b/tests/spec/arb_vertex_program/getenv4d-with-error.c index 6e07555bc..6bdfc7cb4 100644 --- a/tests/spec/arb_vertex_program/getenv4d-with-error.c +++ b/tests/spec/arb_vertex_program/getenv4d-with-error.c @@ -28,7 +28,7 @@ * context. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_vertex_program/getlocal4d-with-error.c b/tests/spec/arb_vertex_program/getlocal4d-with-error.c index f7a453c8a..243fd4f93 100644 --- a/tests/spec/arb_vertex_program/getlocal4d-with-error.c +++ b/tests/spec/arb_vertex_program/getlocal4d-with-error.c @@ -28,7 +28,7 @@ * context. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_vertex_program/minmax.c b/tests/spec/arb_vertex_program/minmax.c index b58bc5482..461d17339 100644 --- a/tests/spec/arb_vertex_program/minmax.c +++ b/tests/spec/arb_vertex_program/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum values in GL_ARB_vertex_program. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c index f28ed84a6..82e4f0372 100644 --- a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c +++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c @@ -27,7 +27,7 @@ /* this test does some basic tests of ARB_vertex_type_2_10_10_10 vbos */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/spec/ati_draw_buffers/arbfp-no-index.c b/tests/spec/ati_draw_buffers/arbfp-no-index.c index 204556707..d3f10f5de 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-index.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-index.c @@ -39,7 +39,7 @@ * This bug in Mesa impacted Trine. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/ati_draw_buffers/arbfp-no-option.c b/tests/spec/ati_draw_buffers/arbfp-no-option.c index 0a1491abf..3c3212fe9 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-option.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-option.c @@ -38,7 +38,7 @@ * into which output color 0 is written.' */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/ati_draw_buffers/arbfp.c b/tests/spec/ati_draw_buffers/arbfp.c index d69e87342..496c43e9b 100644 --- a/tests/spec/ati_draw_buffers/arbfp.c +++ b/tests/spec/ati_draw_buffers/arbfp.c @@ -32,7 +32,7 @@ * ATI_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/spec/ati_envmap_bumpmap/bump.c b/tests/spec/ati_envmap_bumpmap/bump.c index 7ae2e2c06..e6c95b850 100644 --- a/tests/spec/ati_envmap_bumpmap/bump.c +++ b/tests/spec/ati_envmap_bumpmap/bump.c @@ -27,7 +27,7 @@ */ #include "piglit-framework.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define TEXSIZE 32 diff --git a/tests/spec/ext_fog_coord/modes.c b/tests/spec/ext_fog_coord/modes.c index df1e7a939..e0ef6f44b 100644 --- a/tests/spec/ext_fog_coord/modes.c +++ b/tests/spec/ext_fog_coord/modes.c @@ -26,7 +26,7 @@ * Tests that the three fog modes work with fog enabled using EXT_fog_coord. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #if defined(_WIN32) diff --git a/tests/spec/ext_framebuffer_multisample/common.h b/tests/spec/ext_framebuffer_multisample/common.h index dd0937020..d941e96c6 100644 --- a/tests/spec/ext_framebuffer_multisample/common.h +++ b/tests/spec/ext_framebuffer_multisample/common.h @@ -26,7 +26,7 @@ * test cases. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "math.h" enum test_type_enum { diff --git a/tests/spec/ext_framebuffer_multisample/dlist.c b/tests/spec/ext_framebuffer_multisample/dlist.c index b8964f1fa..9f4a05583 100644 --- a/tests/spec/ext_framebuffer_multisample/dlist.c +++ b/tests/spec/ext_framebuffer_multisample/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist.c diff --git a/tests/spec/ext_framebuffer_multisample/minmax.c b/tests/spec/ext_framebuffer_multisample/minmax.c index a5ea174a0..7cb515cae 100644 --- a/tests/spec/ext_framebuffer_multisample/minmax.c +++ b/tests/spec/ext_framebuffer_multisample/minmax.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file max_samples.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c index e05d7ddb3..6b0e984e2 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c +++ b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-copypixels.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c index 06b3dd6e5..06bcadb30 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c +++ b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-copyteximage.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c index e95335736..6ffe25fb4 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c +++ b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-max-samples.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c b/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c index 3d5bf6e87..ab6fea778 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c +++ b/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file samples.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-readpixels.c b/tests/spec/ext_framebuffer_multisample/negative-readpixels.c index 44385d5ae..dfc792e3d 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-readpixels.c +++ b/tests/spec/ext_framebuffer_multisample/negative-readpixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-readpixels.c diff --git a/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c index cd69d165f..c04241d89 100644 --- a/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c +++ b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file renderbuffer-samples.c diff --git a/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c index b8f459232..692e8b256 100644 --- a/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c +++ b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file renderbufferstorage-samples.c diff --git a/tests/spec/ext_framebuffer_multisample/samples.c b/tests/spec/ext_framebuffer_multisample/samples.c index 2c5e17862..3e5eab730 100644 --- a/tests/spec/ext_framebuffer_multisample/samples.c +++ b/tests/spec/ext_framebuffer_multisample/samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file samples.c diff --git a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c index 30aeb3af0..748c86b08 100644 --- a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c +++ b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.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/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c index ba5aad570..8e0469b01 100644 --- a/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c +++ b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c @@ -67,7 +67,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_packed_float/pack.c b/tests/spec/ext_packed_float/pack.c index 47c264054..9e9eff87a 100755 --- a/tests/spec/ext_packed_float/pack.c +++ b/tests/spec/ext_packed_float/pack.c @@ -27,7 +27,7 @@ * GL_UNSIGNED_INT_10F_11F_11F_REV format. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/ext_texture_array/maxlayers.c b/tests/spec/ext_texture_array/maxlayers.c index 5fdbca04b..07caed687 100644 --- a/tests/spec/ext_texture_array/maxlayers.c +++ b/tests/spec/ext_texture_array/maxlayers.c @@ -28,7 +28,7 @@ * GL_MAX_TEXTURE_LAYERS layers. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/api-drawpixels.c b/tests/spec/ext_texture_integer/api-drawpixels.c index 8b0492eff..7545416b0 100644 --- a/tests/spec/ext_texture_integer/api-drawpixels.c +++ b/tests/spec/ext_texture_integer/api-drawpixels.c @@ -56,7 +56,7 @@ * specification and check that impleentations follow that. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/api-readpixels.c b/tests/spec/ext_texture_integer/api-readpixels.c index 59cf5bb04..c9409aabf 100644 --- a/tests/spec/ext_texture_integer/api-readpixels.c +++ b/tests/spec/ext_texture_integer/api-readpixels.c @@ -28,7 +28,7 @@ * Tests GL_EXT_texture_integer's error behavior with glReadPixels(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/api-teximage.c b/tests/spec/ext_texture_integer/api-teximage.c index 8f9f82a21..d8ba4148b 100644 --- a/tests/spec/ext_texture_integer/api-teximage.c +++ b/tests/spec/ext_texture_integer/api-teximage.c @@ -28,7 +28,7 @@ * Tests GL_EXT_texture_integer's error behavior with glTexImage2D(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/fbo-blending.c b/tests/spec/ext_texture_integer/fbo-blending.c index f07e9c6b5..4ba3cf457 100644 --- a/tests/spec/ext_texture_integer/fbo-blending.c +++ b/tests/spec/ext_texture_integer/fbo-blending.c @@ -40,7 +40,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c b/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c index 7a5c7eda5..df3e71a0d 100644 --- a/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c +++ b/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c @@ -32,7 +32,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c b/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c index 97ed32fbc..9b97b063f 100644 --- a/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c +++ b/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c @@ -32,7 +32,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/getteximage-clamping.c b/tests/spec/ext_texture_integer/getteximage-clamping.c index ed3daedb1..0f031eea1 100644 --- a/tests/spec/ext_texture_integer/getteximage-clamping.c +++ b/tests/spec/ext_texture_integer/getteximage-clamping.c @@ -44,7 +44,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/texture-integer-glsl130.c b/tests/spec/ext_texture_integer/texture-integer-glsl130.c index 8f17bfb22..49b2f0ef1 100644 --- a/tests/spec/ext_texture_integer/texture-integer-glsl130.c +++ b/tests/spec/ext_texture_integer/texture-integer-glsl130.c @@ -28,7 +28,7 @@ * simpler test modified for GLSL1.30 by airlied */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_timer_query/time-elapsed.c b/tests/spec/ext_timer_query/time-elapsed.c index 2df5fc00d..09be416e1 100644 --- a/tests/spec/ext_timer_query/time-elapsed.c +++ b/tests/spec/ext_timer_query/time-elapsed.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file time-elapsed.c diff --git a/tests/spec/ext_transform_feedback/alignment.c b/tests/spec/ext_transform_feedback/alignment.c index 9e8bc72cb..9e8695993 100644 --- a/tests/spec/ext_transform_feedback/alignment.c +++ b/tests/spec/ext_transform_feedback/alignment.c @@ -32,7 +32,7 @@ * glBindBufferRange(). This value may be 0, 4, 8, or 12. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define BUFFER_SIZE 0x40 diff --git a/tests/spec/ext_transform_feedback/api-errors.c b/tests/spec/ext_transform_feedback/api-errors.c index c73748a1a..4e015bc61 100644 --- a/tests/spec/ext_transform_feedback/api-errors.c +++ b/tests/spec/ext_transform_feedback/api-errors.c @@ -48,7 +48,7 @@ * implementation is not overly aggressive in flagging errors. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/buffer-usage.c b/tests/spec/ext_transform_feedback/buffer-usage.c index 6dd0e62fb..0e9de31fa 100644 --- a/tests/spec/ext_transform_feedback/buffer-usage.c +++ b/tests/spec/ext_transform_feedback/buffer-usage.c @@ -28,7 +28,7 @@ * segfault on certain buffer object allocation 'usage' arguments. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define NUM_POINTS 10002 #define SHIFT_COUNT 64 diff --git a/tests/spec/ext_transform_feedback/builtin-varyings.c b/tests/spec/ext_transform_feedback/builtin-varyings.c index 7faecd5a6..5f799482c 100644 --- a/tests/spec/ext_transform_feedback/builtin-varyings.c +++ b/tests/spec/ext_transform_feedback/builtin-varyings.c @@ -32,7 +32,7 @@ * them. Same for gl_FrontSecondaryColor and gl_BackSecondaryColor. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/discard-api.c b/tests/spec/ext_transform_feedback/discard-api.c index 24c04d759..8cac71d3d 100644 --- a/tests/spec/ext_transform_feedback/discard-api.c +++ b/tests/spec/ext_transform_feedback/discard-api.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-api.c diff --git a/tests/spec/ext_transform_feedback/discard-bitmap.c b/tests/spec/ext_transform_feedback/discard-bitmap.c index 45b01f4bb..136e62f49 100644 --- a/tests/spec/ext_transform_feedback/discard-bitmap.c +++ b/tests/spec/ext_transform_feedback/discard-bitmap.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-bitmap.c diff --git a/tests/spec/ext_transform_feedback/discard-clear.c b/tests/spec/ext_transform_feedback/discard-clear.c index a3e99a6b0..8cd79e646 100644 --- a/tests/spec/ext_transform_feedback/discard-clear.c +++ b/tests/spec/ext_transform_feedback/discard-clear.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-clear.c diff --git a/tests/spec/ext_transform_feedback/discard-copypixels.c b/tests/spec/ext_transform_feedback/discard-copypixels.c index beb196e83..17628cbee 100644 --- a/tests/spec/ext_transform_feedback/discard-copypixels.c +++ b/tests/spec/ext_transform_feedback/discard-copypixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-copypixels.c diff --git a/tests/spec/ext_transform_feedback/discard-drawarrays.c b/tests/spec/ext_transform_feedback/discard-drawarrays.c index 87a76881a..943f206b8 100644 --- a/tests/spec/ext_transform_feedback/discard-drawarrays.c +++ b/tests/spec/ext_transform_feedback/discard-drawarrays.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-drawarrays.c diff --git a/tests/spec/ext_transform_feedback/discard-drawpixels.c b/tests/spec/ext_transform_feedback/discard-drawpixels.c index 08cc4e4c8..54fe8523a 100644 --- a/tests/spec/ext_transform_feedback/discard-drawpixels.c +++ b/tests/spec/ext_transform_feedback/discard-drawpixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-drawpixels.c diff --git a/tests/spec/ext_transform_feedback/generatemipmap.c b/tests/spec/ext_transform_feedback/generatemipmap.c index 1ee255f84..3fa355681 100644 --- a/tests/spec/ext_transform_feedback/generatemipmap.c +++ b/tests/spec/ext_transform_feedback/generatemipmap.c @@ -62,7 +62,7 @@ * tests/fbo/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/spec/ext_transform_feedback/get-buffer-state.c b/tests/spec/ext_transform_feedback/get-buffer-state.c index 6102c2ce2..1f70b5e96 100644 --- a/tests/spec/ext_transform_feedback/get-buffer-state.c +++ b/tests/spec/ext_transform_feedback/get-buffer-state.c @@ -28,7 +28,7 @@ * transform feedback buffers. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/immediate-reuse.c b/tests/spec/ext_transform_feedback/immediate-reuse.c index 9b836f086..daad7c472 100644 --- a/tests/spec/ext_transform_feedback/immediate-reuse.c +++ b/tests/spec/ext_transform_feedback/immediate-reuse.c @@ -36,7 +36,7 @@ * a stepped gradient being drawn. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/interleaved.c b/tests/spec/ext_transform_feedback/interleaved.c index 795694e73..1bf6eea4d 100644 --- a/tests/spec/ext_transform_feedback/interleaved.c +++ b/tests/spec/ext_transform_feedback/interleaved.c @@ -27,7 +27,7 @@ * Test writing interleaved vertex attribs into a buffer object. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/intervening-read.c b/tests/spec/ext_transform_feedback/intervening-read.c index 161c2593d..05e53352e 100644 --- a/tests/spec/ext_transform_feedback/intervening-read.c +++ b/tests/spec/ext_transform_feedback/intervening-read.c @@ -46,7 +46,7 @@ * doesn't interfere with overflow checking. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/max-varyings.c b/tests/spec/ext_transform_feedback/max-varyings.c index 2048cbb3d..78c46a300 100644 --- a/tests/spec/ext_transform_feedback/max-varyings.c +++ b/tests/spec/ext_transform_feedback/max-varyings.c @@ -37,7 +37,7 @@ * possible lengths and offsets. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define MAX_VARYING 32 diff --git a/tests/spec/ext_transform_feedback/negative-prims.c b/tests/spec/ext_transform_feedback/negative-prims.c index cee33db34..13366bc39 100644 --- a/tests/spec/ext_transform_feedback/negative-prims.c +++ b/tests/spec/ext_transform_feedback/negative-prims.c @@ -41,7 +41,7 @@ * primitives) */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/order.c b/tests/spec/ext_transform_feedback/order.c index 0d3b79414..6ddea4f0e 100644 --- a/tests/spec/ext_transform_feedback/order.c +++ b/tests/spec/ext_transform_feedback/order.c @@ -52,7 +52,7 @@ * "triangles", "lines", or "points". */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define NUM_POINTS 10002 #define SHIFT_COUNT 64 diff --git a/tests/spec/ext_transform_feedback/output-type.c b/tests/spec/ext_transform_feedback/output-type.c index 43e8a9ba9..8b82a1ff6 100644 --- a/tests/spec/ext_transform_feedback/output-type.c +++ b/tests/spec/ext_transform_feedback/output-type.c @@ -28,7 +28,7 @@ * works as expected. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/overflow-edge-cases.c b/tests/spec/ext_transform_feedback/overflow-edge-cases.c index 2e23e1962..233abf970 100644 --- a/tests/spec/ext_transform_feedback/overflow-edge-cases.c +++ b/tests/spec/ext_transform_feedback/overflow-edge-cases.c @@ -41,7 +41,7 @@ * - GL_PRIMITIVES_GENERATED is set correctly. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/position.c b/tests/spec/ext_transform_feedback/position.c index 603ae24e5..5f368bf33 100644 --- a/tests/spec/ext_transform_feedback/position.c +++ b/tests/spec/ext_transform_feedback/position.c @@ -28,7 +28,7 @@ * BindBufferOffset, BindBufferRange, GL_RASTERIZER_DISCARD, and related queries. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/separate.c b/tests/spec/ext_transform_feedback/separate.c index 1dc946de2..868fbe65f 100644 --- a/tests/spec/ext_transform_feedback/separate.c +++ b/tests/spec/ext_transform_feedback/separate.c @@ -27,7 +27,7 @@ * Test writing separate vertex attribs into a buffer object. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/tessellation.c b/tests/spec/ext_transform_feedback/tessellation.c index 8c79e45dc..9b52a2fdd 100644 --- a/tests/spec/ext_transform_feedback/tessellation.c +++ b/tests/spec/ext_transform_feedback/tessellation.c @@ -116,7 +116,7 @@ * failures. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define BUFFER_SIZE 20 diff --git a/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c b/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c index c35581874..f83b3f8cb 100644 --- a/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c +++ b/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c @@ -30,7 +30,7 @@ #include <EGL/egl.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-2.0/api/clip-flag-behavior.c b/tests/spec/gl-2.0/api/clip-flag-behavior.c index 64639cd79..0fb085261 100644 --- a/tests/spec/gl-2.0/api/clip-flag-behavior.c +++ b/tests/spec/gl-2.0/api/clip-flag-behavior.c @@ -36,7 +36,7 @@ * glDisable is consistent. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-2.0/api/getattriblocation-conventional.c b/tests/spec/gl-2.0/api/getattriblocation-conventional.c index 14ab5516c..8f769eb05 100644 --- a/tests/spec/gl-2.0/api/getattriblocation-conventional.c +++ b/tests/spec/gl-2.0/api/getattriblocation-conventional.c @@ -28,7 +28,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-2.0/vertex-program-two-side.c b/tests/spec/gl-2.0/vertex-program-two-side.c index 77a4a43c7..5014751e3 100644 --- a/tests/spec/gl-2.0/vertex-program-two-side.c +++ b/tests/spec/gl-2.0/vertex-program-two-side.c @@ -43,7 +43,7 @@ */ #define _GNU_SOURCE -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-2.1/minmax.c b/tests/spec/gl-2.1/minmax.c index 6970ad3b2..edb32a23c 100644 --- a/tests/spec/gl-2.1/minmax.c +++ b/tests/spec/gl-2.1/minmax.c @@ -26,7 +26,7 @@ * of the GL 2.1 spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c index 37e81e7d8..b6dbfc786 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c +++ b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c @@ -27,7 +27,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/bindfragdata-link-error.c b/tests/spec/gl-3.0/api/bindfragdata-link-error.c index cdf67f3f9..0e87cf7e9 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-link-error.c +++ b/tests/spec/gl-3.0/api/bindfragdata-link-error.c @@ -25,7 +25,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c index f8242cb91..8a87ffcad 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c +++ b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c @@ -26,7 +26,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/clearbuffer-common.c b/tests/spec/gl-3.0/api/clearbuffer-common.c index f421b6356..f016b5866 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-common.c +++ b/tests/spec/gl-3.0/api/clearbuffer-common.c @@ -24,7 +24,7 @@ * \file clearbuffer-common.c * Common code and data for the basic glClearBuffer tests */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" const float default_color[4] = { 0.2, 0.4, 0.6, 1.0 }; const float default_depth = 0.2; diff --git a/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c b/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c index 87fc6c4eb..a15a421a5 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c +++ b/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c @@ -47,7 +47,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/clearbuffer-depth.c b/tests/spec/gl-3.0/api/clearbuffer-depth.c index 08d9e3518..3bd549107 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-depth.c +++ b/tests/spec/gl-3.0/api/clearbuffer-depth.c @@ -47,7 +47,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/clearbuffer-display-lists.c b/tests/spec/gl-3.0/api/clearbuffer-display-lists.c index 7924f911a..621fd817e 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-display-lists.c +++ b/tests/spec/gl-3.0/api/clearbuffer-display-lists.c @@ -31,7 +31,7 @@ * \author Anuj Phogat */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c index 3a6b4a6d5..a81c53ea4 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c @@ -26,7 +26,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c index 2a915c143..4ab765bce 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c @@ -27,7 +27,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c b/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c index de230eb12..016d765ed 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c +++ b/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c @@ -44,7 +44,7 @@ * \author Anuj Phogat */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" #define COUNT ARRAY_SIZE(test_vectors) diff --git a/tests/spec/gl-3.0/api/clearbuffer-stencil.c b/tests/spec/gl-3.0/api/clearbuffer-stencil.c index e0420e76a..a31d1a2a0 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-stencil.c +++ b/tests/spec/gl-3.0/api/clearbuffer-stencil.c @@ -47,7 +47,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/getfragdatalocation.c b/tests/spec/gl-3.0/api/getfragdatalocation.c index 25897f596..a85bae9ce 100644 --- a/tests/spec/gl-3.0/api/getfragdatalocation.c +++ b/tests/spec/gl-3.0/api/getfragdatalocation.c @@ -25,7 +25,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/integer-errors.c b/tests/spec/gl-3.0/api/integer-errors.c index f26e59287..90e330a38 100644 --- a/tests/spec/gl-3.0/api/integer-errors.c +++ b/tests/spec/gl-3.0/api/integer-errors.c @@ -28,7 +28,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN(100 /*window_width*/, 100 /*window_height*/, diff --git a/tests/spec/gl-3.0/minmax.c b/tests/spec/gl-3.0/minmax.c index 8e2da7877..7bcf83ab9 100644 --- a/tests/spec/gl-3.0/minmax.c +++ b/tests/spec/gl-3.0/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.0 spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c index d36f1c3af..4c87a371c 100644 --- a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c +++ b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "sized-internalformats.h" /** diff --git a/tests/spec/gl-3.0/required-sized-texture-formats.c b/tests/spec/gl-3.0/required-sized-texture-formats.c index a8989b656..21c7849a1 100644 --- a/tests/spec/gl-3.0/required-sized-texture-formats.c +++ b/tests/spec/gl-3.0/required-sized-texture-formats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "sized-internalformats.h" /** diff --git a/tests/spec/gl-3.0/required-texture-attachment-formats.c b/tests/spec/gl-3.0/required-texture-attachment-formats.c index 7b64d8cc2..1850ab397 100644 --- a/tests/spec/gl-3.0/required-texture-attachment-formats.c +++ b/tests/spec/gl-3.0/required-texture-attachment-formats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "sized-internalformats.h" /** diff --git a/tests/spec/gl-3.0/texture-integer.c b/tests/spec/gl-3.0/texture-integer.c index 7cc65a57d..4fad5e1a5 100644 --- a/tests/spec/gl-3.0/texture-integer.c +++ b/tests/spec/gl-3.0/texture-integer.c @@ -27,7 +27,7 @@ * Tests OpenGL 3.0 integer textures */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN(100 /*window_width*/, 100 /*window_height*/, diff --git a/tests/spec/gl-3.1/minmax.c b/tests/spec/gl-3.1/minmax.c index 776361221..0f823262c 100644 --- a/tests/spec/gl-3.1/minmax.c +++ b/tests/spec/gl-3.1/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.1 spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c b/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c index d38c2a796..9fed5b6a0 100644 --- a/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c +++ b/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c @@ -168,7 +168,7 @@ * it does in fixed function mode. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c b/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c index 601fb508e..1ff270ba0 100644 --- a/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c +++ b/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c @@ -31,7 +31,7 @@ * shader to it still works. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/glsl-1.20/recursion/recursion.c b/tests/spec/glsl-1.20/recursion/recursion.c index 21cae9daf..9887d4f55 100644 --- a/tests/spec/glsl-1.20/recursion/recursion.c +++ b/tests/spec/glsl-1.20/recursion/recursion.c @@ -47,7 +47,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c index 85a16e5a0..e2a5912af 100644 --- a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c +++ b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c @@ -57,7 +57,7 @@ * defined in the vertex and fragment shaders, and that this value is * at least 8. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c index cee94c8d2..52f1ba5d0 100644 --- a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c +++ b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c @@ -42,7 +42,7 @@ * 2x2 subspan aligned). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c index e1baac363..ba7f7ca6a 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c @@ -29,7 +29,7 @@ * Creates a mipmapped 64x32 2D texture and draws a series of squares whose * color contains a texel fetched from each quadrant of the rgbw texture. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 90 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c index fac1c462e..5211377f2 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c @@ -29,7 +29,7 @@ * Creates a mipmapped 64x32 2D texture and draws a series of squares whose * color contains a texel fetched from each quadrant of the rgbw texture. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 90 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c index d638cf5a7..8d7865e46 100644 --- a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c +++ b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c @@ -108,7 +108,7 @@ * out of the shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/vertexid-beginend.c b/tests/spec/glsl-1.30/execution/vertexid-beginend.c index 0b0198e18..8a5aa94d0 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-beginend.c +++ b/tests/spec/glsl-1.30/execution/vertexid-beginend.c @@ -27,7 +27,7 @@ * Test that gl_VertexID has the correct values. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c b/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c index ce5a432a3..8c62e8b76 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c +++ b/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c @@ -27,7 +27,7 @@ * Test that gl_VertexID has the correct values. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/vertexid-drawelements.c b/tests/spec/glsl-1.30/execution/vertexid-drawelements.c index 6c8f6980f..f197eff1f 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-drawelements.c +++ b/tests/spec/glsl-1.30/execution/vertexid-drawelements.c @@ -27,7 +27,7 @@ * Test that gl_VertexID has the correct values. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, diff --git a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c index 60f9d836a..3210830f3 100644 --- a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c +++ b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c @@ -34,7 +34,7 @@ * contains writes to both variables, even if those writes would never * both occur in the same render. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.30/texel-offset-limits.c b/tests/spec/glsl-1.30/texel-offset-limits.c index fe8f13056..17119d7d3 100644 --- a/tests/spec/glsl-1.30/texel-offset-limits.c +++ b/tests/spec/glsl-1.30/texel-offset-limits.c @@ -28,7 +28,7 @@ * Tests that GLSL 1.30 exposes the GL_MIN/MAX_PROGRAM_OFFSET_LIMITS. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/glsl-1.40/tf-no-position.c b/tests/spec/glsl-1.40/tf-no-position.c index 50b475883..16927f8aa 100644 --- a/tests/spec/glsl-1.40/tf-no-position.c +++ b/tests/spec/glsl-1.40/tf-no-position.c @@ -28,7 +28,7 @@ * using EXT_transform_feedback to get results. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define BUFFER_SIZE 4 diff --git a/tests/spec/glx_arb_create_context/common.c b/tests/spec/glx_arb_create_context/common.c index be002560a..7188a6639 100644 --- a/tests/spec/glx_arb_create_context/common.c +++ b/tests/spec/glx_arb_create_context/common.c @@ -21,7 +21,7 @@ */ #include <ctype.h> #include <errno.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/default-major-version.c b/tests/spec/glx_arb_create_context/default-major-version.c index 84de99058..50b5ff639 100644 --- a/tests/spec/glx_arb_create_context/default-major-version.c +++ b/tests/spec/glx_arb_create_context/default-major-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/default-minor-version.c b/tests/spec/glx_arb_create_context/default-minor-version.c index c0060393f..69a7ecf68 100644 --- a/tests/spec/glx_arb_create_context/default-minor-version.c +++ b/tests/spec/glx_arb_create_context/default-minor-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-attribute.c b/tests/spec/glx_arb_create_context/invalid-attribute.c index 88a581b72..3b7ac36d8 100644 --- a/tests/spec/glx_arb_create_context/invalid-attribute.c +++ b/tests/spec/glx_arb_create_context/invalid-attribute.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c b/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c index 1da602f9a..0e023194d 100644 --- a/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c +++ b/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-flag.c b/tests/spec/glx_arb_create_context/invalid-flag.c index 60ac2d9ea..adae14358 100644 --- a/tests/spec/glx_arb_create_context/invalid-flag.c +++ b/tests/spec/glx_arb_create_context/invalid-flag.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-gl-version.c b/tests/spec/glx_arb_create_context/invalid-gl-version.c index 7451159ec..501504f25 100644 --- a/tests/spec/glx_arb_create_context/invalid-gl-version.c +++ b/tests/spec/glx_arb_create_context/invalid-gl-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c b/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c index 50c44a399..130222f51 100644 --- a/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c +++ b/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-render-type.c b/tests/spec/glx_arb_create_context/invalid-render-type.c index a6ffa1ef7..5ceca05f3 100644 --- a/tests/spec/glx_arb_create_context/invalid-render-type.c +++ b/tests/spec/glx_arb_create_context/invalid-render-type.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/valid-attribute-empty.c b/tests/spec/glx_arb_create_context/valid-attribute-empty.c index 5cfc37ec6..22d94a3e8 100644 --- a/tests/spec/glx_arb_create_context/valid-attribute-empty.c +++ b/tests/spec/glx_arb_create_context/valid-attribute-empty.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/valid-attribute-null.c b/tests/spec/glx_arb_create_context/valid-attribute-null.c index 32ab49b8d..2ab853a7a 100644 --- a/tests/spec/glx_arb_create_context/valid-attribute-null.c +++ b/tests/spec/glx_arb_create_context/valid-attribute-null.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c b/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c index 17f408dd7..6b3e173d1 100644 --- a/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c +++ b/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/common.c b/tests/spec/glx_ext_import_context/common.c index d3318bf9a..9048472b6 100644 --- a/tests/spec/glx_ext_import_context/common.c +++ b/tests/spec/glx_ext_import_context/common.c @@ -21,7 +21,7 @@ */ #include <assert.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/free-context.c b/tests/spec/glx_ext_import_context/free-context.c index 5bad0ff4f..8f1861096 100644 --- a/tests/spec/glx_ext_import_context/free-context.c +++ b/tests/spec/glx_ext_import_context/free-context.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/get-context-id.c b/tests/spec/glx_ext_import_context/get-context-id.c index 26bfaadc5..7b78091de 100644 --- a/tests/spec/glx_ext_import_context/get-context-id.c +++ b/tests/spec/glx_ext_import_context/get-context-id.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/get-current-display.c b/tests/spec/glx_ext_import_context/get-current-display.c index fc6fcdbf6..342aac178 100644 --- a/tests/spec/glx_ext_import_context/get-current-display.c +++ b/tests/spec/glx_ext_import_context/get-current-display.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c b/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c index 297d91a3f..eb7b70811 100644 --- a/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c +++ b/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/import-context-multi-process.c b/tests/spec/glx_ext_import_context/import-context-multi-process.c index eec28b27d..8ffda55ad 100644 --- a/tests/spec/glx_ext_import_context/import-context-multi-process.c +++ b/tests/spec/glx_ext_import_context/import-context-multi-process.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/import-context-single-process.c b/tests/spec/glx_ext_import_context/import-context-single-process.c index ead037490..7b4a75918 100644 --- a/tests/spec/glx_ext_import_context/import-context-single-process.c +++ b/tests/spec/glx_ext_import_context/import-context-single-process.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/make-current-multi-process.c b/tests/spec/glx_ext_import_context/make-current-multi-process.c index a4c765cd3..db93354ec 100644 --- a/tests/spec/glx_ext_import_context/make-current-multi-process.c +++ b/tests/spec/glx_ext_import_context/make-current-multi-process.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/make-current-single-process.c b/tests/spec/glx_ext_import_context/make-current-single-process.c index d3a0fb8fa..ae15c2b18 100644 --- a/tests/spec/glx_ext_import_context/make-current-single-process.c +++ b/tests/spec/glx_ext_import_context/make-current-single-process.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/query-context-info.c b/tests/spec/glx_ext_import_context/query-context-info.c index 2be20132a..84e225aff 100644 --- a/tests/spec/glx_ext_import_context/query-context-info.c +++ b/tests/spec/glx_ext_import_context/query-context-info.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/nv_conditional_render/begin-while-active.c b/tests/spec/nv_conditional_render/begin-while-active.c index d16869ba7..a1363230b 100644 --- a/tests/spec/nv_conditional_render/begin-while-active.c +++ b/tests/spec/nv_conditional_render/begin-while-active.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file begin-while-active.c diff --git a/tests/spec/nv_conditional_render/begin-zero.c b/tests/spec/nv_conditional_render/begin-zero.c index 008a7ce48..5a8177522 100644 --- a/tests/spec/nv_conditional_render/begin-zero.c +++ b/tests/spec/nv_conditional_render/begin-zero.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file begin-zero.c diff --git a/tests/spec/nv_conditional_render/bitmap.c b/tests/spec/nv_conditional_render/bitmap.c index 3f35f3f6e..af38ca03c 100644 --- a/tests/spec/nv_conditional_render/bitmap.c +++ b/tests/spec/nv_conditional_render/bitmap.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file bitmap.c diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c index 48367ee01..77269fc23 100644 --- a/tests/spec/nv_conditional_render/blitframebuffer.c +++ b/tests/spec/nv_conditional_render/blitframebuffer.c @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file blitframebuffer.c diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c index face8f466..aefeed9e1 100644 --- a/tests/spec/nv_conditional_render/clear.c +++ b/tests/spec/nv_conditional_render/clear.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file clear.c diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c index 2d17d35e8..59b732e16 100644 --- a/tests/spec/nv_conditional_render/copypixels.c +++ b/tests/spec/nv_conditional_render/copypixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file copypixels.c diff --git a/tests/spec/nv_conditional_render/copyteximage.c b/tests/spec/nv_conditional_render/copyteximage.c index 81c8ac98b..a014d1dea 100644 --- a/tests/spec/nv_conditional_render/copyteximage.c +++ b/tests/spec/nv_conditional_render/copyteximage.c @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file copyteximage.c diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c index debdeeebd..3449fa052 100644 --- a/tests/spec/nv_conditional_render/copytexsubimage.c +++ b/tests/spec/nv_conditional_render/copytexsubimage.c @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file copytexsubimage.c diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/dlist.c index 844e15bb5..fe6265036 100644 --- a/tests/spec/nv_conditional_render/dlist.c +++ b/tests/spec/nv_conditional_render/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist.c diff --git a/tests/spec/nv_conditional_render/drawpixels.c b/tests/spec/nv_conditional_render/drawpixels.c index d100712c6..ddb45108e 100644 --- a/tests/spec/nv_conditional_render/drawpixels.c +++ b/tests/spec/nv_conditional_render/drawpixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file drawpixels.c diff --git a/tests/spec/nv_conditional_render/generatemipmap.c b/tests/spec/nv_conditional_render/generatemipmap.c index 5ac8f6db5..8c55e9ae3 100644 --- a/tests/spec/nv_conditional_render/generatemipmap.c +++ b/tests/spec/nv_conditional_render/generatemipmap.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file generatemipmap.c diff --git a/tests/spec/nv_conditional_render/vertex_array.c b/tests/spec/nv_conditional_render/vertex_array.c index f8e64a022..b75c147b5 100644 --- a/tests/spec/nv_conditional_render/vertex_array.c +++ b/tests/spec/nv_conditional_render/vertex_array.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file vertex_array.c diff --git a/tests/spec/nv_texture_barrier/blending-in-shader.c b/tests/spec/nv_texture_barrier/blending-in-shader.c index 334ef0742..d3d1642cc 100644 --- a/tests/spec/nv_texture_barrier/blending-in-shader.c +++ b/tests/spec/nv_texture_barrier/blending-in-shader.c @@ -27,7 +27,7 @@ * Test programmable blending with GL_NV_texture_barrier. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c index 6fa8b0101..58d8d04fc 100644 --- a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c +++ b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #ifndef GL_OES_compressed_ETC1_RGB8_texture #define GL_ETC1_RGB8_OES 0x8D64 diff --git a/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c b/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c index 21ecee993..4d433c3ed 100644 --- a/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c +++ b/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/oes_draw_texture/oes_draw_texture.c b/tests/spec/oes_draw_texture/oes_draw_texture.c index e81c2452b..ff6068393 100644 --- a/tests/spec/oes_draw_texture/oes_draw_texture.c +++ b/tests/spec/oes_draw_texture/oes_draw_texture.c @@ -30,7 +30,7 @@ #include <EGL/egl.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define TEXTURE_SIZE 2 diff --git a/tests/texturing/1-1-linear-texture.c b/tests/texturing/1-1-linear-texture.c index dc4ee6643..0514890bb 100644 --- a/tests/texturing/1-1-linear-texture.c +++ b/tests/texturing/1-1-linear-texture.c @@ -29,7 +29,7 @@ * Tests that the 1:1 texture with filter set to linear is sampled correctly. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/texturing/array-texture.c b/tests/texturing/array-texture.c index d45cd8d8c..e175e396c 100644 --- a/tests/texturing/array-texture.c +++ b/tests/texturing/array-texture.c @@ -29,7 +29,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, diff --git a/tests/texturing/compressedteximage.c b/tests/texturing/compressedteximage.c index 1d3d48d55..dd83a7b18 100644 --- a/tests/texturing/compressedteximage.c +++ b/tests/texturing/compressedteximage.c @@ -32,7 +32,7 @@ * glCompressedTexImage2D(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define SIZE 128 diff --git a/tests/texturing/copyteximage-border.c b/tests/texturing/copyteximage-border.c index 603b4789f..58451fe6e 100644 --- a/tests/texturing/copyteximage-border.c +++ b/tests/texturing/copyteximage-border.c @@ -27,7 +27,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /* Size of the body of the texture, not counting border. */ #define TEX_SIZE 64 diff --git a/tests/texturing/copyteximage-clipping.c b/tests/texturing/copyteximage-clipping.c index 7db2a332c..1926d99ad 100644 --- a/tests/texturing/copyteximage-clipping.c +++ b/tests/texturing/copyteximage-clipping.c @@ -27,7 +27,7 @@ * XXX we should also do some rendering with the texture and check the results. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/texturing/copyteximage.c b/tests/texturing/copyteximage.c index 8dee0e712..8a3570323 100644 --- a/tests/texturing/copyteximage.c +++ b/tests/texturing/copyteximage.c @@ -29,7 +29,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define IMAGE_SIZE 16 static const GLfloat fcolor[8][4] = { diff --git a/tests/texturing/copytexsubimage.c b/tests/texturing/copytexsubimage.c index f5fbbe35a..90a10cbaa 100644 --- a/tests/texturing/copytexsubimage.c +++ b/tests/texturing/copytexsubimage.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/texturing/crossbar.c b/tests/texturing/crossbar.c index babf7e81b..be9316339 100644 --- a/tests/texturing/crossbar.c +++ b/tests/texturing/crossbar.c @@ -36,7 +36,7 @@ #include <stdlib.h> #include <string.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" static const GLint tests[][8] = { { 1, GL_REPLACE, GL_PRIMARY_COLOR, GL_PRIMARY_COLOR, diff --git a/tests/texturing/cubemap.c b/tests/texturing/cubemap.c index 5312dddf6..7d056905d 100644 --- a/tests/texturing/cubemap.c +++ b/tests/texturing/cubemap.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define PAD 5 diff --git a/tests/texturing/depth-cube-map.c b/tests/texturing/depth-cube-map.c index 24ee1c31f..ad3408a1b 100644 --- a/tests/texturing/depth-cube-map.c +++ b/tests/texturing/depth-cube-map.c @@ -28,7 +28,7 @@ * author: Anuj Phogat */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/texturing/depth-level-clamp.c b/tests/texturing/depth-level-clamp.c index 88554cc55..deed08422 100644 --- a/tests/texturing/depth-level-clamp.c +++ b/tests/texturing/depth-level-clamp.c @@ -35,7 +35,7 @@ * miptree copying for relayout that occurs due to the clamping. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define MAX_SIZE 64 #define MAX_LOD 6 diff --git a/tests/texturing/depth-tex-compare.c b/tests/texturing/depth-tex-compare.c index b9bcf0be9..2d0780b10 100644 --- a/tests/texturing/depth-tex-compare.c +++ b/tests/texturing/depth-tex-compare.c @@ -31,7 +31,7 @@ * clear color (green) using the alpha value. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #define BOX_SIZE 25 diff --git a/tests/texturing/depth-tex-modes-common.c b/tests/texturing/depth-tex-modes-common.c index 253454dda..9ee1302b1 100644 --- a/tests/texturing/depth-tex-modes-common.c +++ b/tests/texturing/depth-tex-modes-common.c @@ -29,7 +29,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "depth-tex-modes-common.h" static void loadTex(void); diff --git a/tests/texturing/depth-tex-modes-glsl.c b/tests/texturing/depth-tex-modes-glsl.c index a7fd3237d..715b3ba3b 100644 --- a/tests/texturing/depth-tex-modes-glsl.c +++ b/tests/texturing/depth-tex-modes-glsl.c @@ -28,7 +28,7 @@ * INTENSITY, and ALPHA with programmable shaders. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/texturing/depth-tex-modes-rg.c b/tests/texturing/depth-tex-modes-rg.c index fff21b6be..a2abf47cc 100644 --- a/tests/texturing/depth-tex-modes-rg.c +++ b/tests/texturing/depth-tex-modes-rg.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #include "depth-tex-modes-common.h" diff --git a/tests/texturing/depth-tex-modes.c b/tests/texturing/depth-tex-modes.c index 959dc17fc..35501a090 100644 --- a/tests/texturing/depth-tex-modes.c +++ b/tests/texturing/depth-tex-modes.c @@ -28,7 +28,7 @@ * textures and texture rectangles. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #include "depth-tex-modes-common.h" diff --git a/tests/texturing/depthstencil-render-miplevels.cpp b/tests/texturing/depthstencil-render-miplevels.cpp index 43cd9a17e..8300518d0 100644 --- a/tests/texturing/depthstencil-render-miplevels.cpp +++ b/tests/texturing/depthstencil-render-miplevels.cpp @@ -84,7 +84,7 @@ * bound to the same buffer. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, diff --git a/tests/texturing/fragment-and-vertex-texturing.c b/tests/texturing/fragment-and-vertex-texturing.c index 930bdb376..4258c0cd7 100644 --- a/tests/texturing/fragment-and-vertex-texturing.c +++ b/tests/texturing/fragment-and-vertex-texturing.c @@ -30,7 +30,7 @@ */ #include <string.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/texturing/fxt1-teximage.c b/tests/texturing/fxt1-teximage.c index be8a8398c..5dc87fc8e 100644 --- a/tests/texturing/fxt1-teximage.c +++ b/tests/texturing/fxt1-teximage.c @@ -32,7 +32,7 @@ * and used. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 300 /*window_width*/, diff --git a/tests/texturing/gen-compressed-teximage.c b/tests/texturing/gen-compressed-teximage.c index 27b6f1129..aa13d3a6d 100644 --- a/tests/texturing/gen-compressed-teximage.c +++ b/tests/texturing/gen-compressed-teximage.c @@ -36,7 +36,7 @@ * existing texture. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, diff --git a/tests/texturing/gen-nonzero-unit.c b/tests/texturing/gen-nonzero-unit.c index c28117366..f035206a4 100644 --- a/tests/texturing/gen-nonzero-unit.c +++ b/tests/texturing/gen-nonzero-unit.c @@ -39,7 +39,7 @@ * existing texture. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, diff --git a/tests/texturing/gen-teximage.c b/tests/texturing/gen-teximage.c index 9dccea15e..d4ed84f44 100644 --- a/tests/texturing/gen-teximage.c +++ b/tests/texturing/gen-teximage.c @@ -36,7 +36,7 @@ * existing texture. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, diff --git a/tests/texturing/gen-texsubimage.c b/tests/texturing/gen-texsubimage.c index 220471001..17002c9b6 100644 --- a/tests/texturing/gen-texsubimage.c +++ b/tests/texturing/gen-texsubimage.c @@ -33,7 +33,7 @@ * in bug #17077. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, diff --git a/tests/texturing/getteximage-formats.c b/tests/texturing/getteximage-formats.c index d7a129d97..8f4101d8b 100644 --- a/tests/texturing/getteximage-formats.c +++ b/tests/texturing/getteximage-formats.c @@ -32,7 +32,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "../fbo/fbo-formats.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/texturing/getteximage-luminance.c b/tests/texturing/getteximage-luminance.c index 521c7eab3..b7f084142 100644 --- a/tests/texturing/getteximage-luminance.c +++ b/tests/texturing/getteximage-luminance.c @@ -28,7 +28,7 @@ * 8 Mar 2012 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/texturing/getteximage-simple.c b/tests/texturing/getteximage-simple.c index 0abf5de5b..e4b464e44 100644 --- a/tests/texturing/getteximage-simple.c +++ b/tests/texturing/getteximage-simple.c @@ -10,7 +10,7 @@ * This used to crash for R300+bufmgr. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/texturing/incomplete-texture.c b/tests/texturing/incomplete-texture.c index fc01557e8..7565d2329 100644 --- a/tests/texturing/incomplete-texture.c +++ b/tests/texturing/incomplete-texture.c @@ -29,7 +29,7 @@ * Oct 2011 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, diff --git a/tests/texturing/levelclamp.c b/tests/texturing/levelclamp.c index 055258db2..f8bac547b 100644 --- a/tests/texturing/levelclamp.c +++ b/tests/texturing/levelclamp.c @@ -30,7 +30,7 @@ * GL_TEXTURE_MAX_LEVEL work on a mipmapped 2D texture. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define MAX_SIZE 32 #define MAX_LEVEL 5 diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c index a6084bb6b..e91e2d4b9 100644 --- a/tests/texturing/lodbias.c +++ b/tests/texturing/lodbias.c @@ -41,7 +41,7 @@ */ #include "piglit-framework.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define SquareSize 32 diff --git a/tests/texturing/lodclamp-between-max.c b/tests/texturing/lodclamp-between-max.c index 53438b868..58b4e3a4b 100644 --- a/tests/texturing/lodclamp-between-max.c +++ b/tests/texturing/lodclamp-between-max.c @@ -32,7 +32,7 @@ * results in appropriate mipmap filtering. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define MAX_SIZE 32 #define MAX_LOD 5 diff --git a/tests/texturing/lodclamp-between.c b/tests/texturing/lodclamp-between.c index 704c7fe9c..80ffce86f 100644 --- a/tests/texturing/lodclamp-between.c +++ b/tests/texturing/lodclamp-between.c @@ -32,7 +32,7 @@ * appropriate mipmap filtering. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define MAX_SIZE 32 #define MAX_LOD 5 diff --git a/tests/texturing/lodclamp.c b/tests/texturing/lodclamp.c index 861d78eda..a55f74d6a 100644 --- a/tests/texturing/lodclamp.c +++ b/tests/texturing/lodclamp.c @@ -30,7 +30,7 @@ * GL_TEXTURE_MAX_LOD work on a mipmapped 2D texture. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define MAX_SIZE 32 #define MAX_LOD 5 diff --git a/tests/texturing/max-texture-size.c b/tests/texturing/max-texture-size.c index 8c6455e9c..cd8ec745e 100644 --- a/tests/texturing/max-texture-size.c +++ b/tests/texturing/max-texture-size.c @@ -41,7 +41,7 @@ * \Author Anuj Phogat <anuj.phogat@gmail.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define COLOR_COMPONENTS 4 /*GL_RGBA*/ PIGLIT_GL_TEST_MAIN( diff --git a/tests/texturing/mipmap-setup.c b/tests/texturing/mipmap-setup.c index b183a19d7..ae8e719e5 100644 --- a/tests/texturing/mipmap-setup.c +++ b/tests/texturing/mipmap-setup.c @@ -31,7 +31,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/texturing/rg-draw-pixels.c b/tests/texturing/rg-draw-pixels.c index b816f57ef..2e3e4d79e 100644 --- a/tests/texturing/rg-draw-pixels.c +++ b/tests/texturing/rg-draw-pixels.c @@ -28,7 +28,7 @@ * and GL_RG and tests for the correct color output. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/texturing/rg-teximage-01.c b/tests/texturing/rg-teximage-01.c index 6bc4a449e..45a292a2b 100644 --- a/tests/texturing/rg-teximage-01.c +++ b/tests/texturing/rg-teximage-01.c @@ -33,7 +33,7 @@ */ #include "piglit-framework.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "rg-teximage-common.h" #define WIDTH 256 diff --git a/tests/texturing/rg-teximage-02.c b/tests/texturing/rg-teximage-02.c index 6019a74d1..d183bc1cb 100644 --- a/tests/texturing/rg-teximage-02.c +++ b/tests/texturing/rg-teximage-02.c @@ -33,7 +33,7 @@ */ #include "piglit-framework.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "rg-teximage-common.h" #define WIDTH 256 diff --git a/tests/texturing/rg-teximage-common.c b/tests/texturing/rg-teximage-common.c index 1f1a7e075..72e1e5f0b 100644 --- a/tests/texturing/rg-teximage-common.c +++ b/tests/texturing/rg-teximage-common.c @@ -33,7 +33,7 @@ */ #include "piglit-framework.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "rg-teximage-common.h" /** diff --git a/tests/texturing/rgtc-teximage-01.c b/tests/texturing/rgtc-teximage-01.c index fff20d25e..5afd24d26 100644 --- a/tests/texturing/rgtc-teximage-01.c +++ b/tests/texturing/rgtc-teximage-01.c @@ -34,7 +34,7 @@ */ #include "piglit-framework.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "rg-teximage-common.h" #define WIDTH 256 diff --git a/tests/texturing/rgtc-teximage-02.c b/tests/texturing/rgtc-teximage-02.c index ae73f71f7..f39aa5898 100644 --- a/tests/texturing/rgtc-teximage-02.c +++ b/tests/texturing/rgtc-teximage-02.c @@ -34,7 +34,7 @@ */ #include "piglit-framework.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "rg-teximage-common.h" #define WIDTH 256 diff --git a/tests/texturing/s3tc-teximage.c b/tests/texturing/s3tc-teximage.c index f0e434879..5583fe70d 100644 --- a/tests/texturing/s3tc-teximage.c +++ b/tests/texturing/s3tc-teximage.c @@ -32,7 +32,7 @@ * used. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, diff --git a/tests/texturing/s3tc-texsubimage.c b/tests/texturing/s3tc-texsubimage.c index 1c481f982..8b508b83b 100644 --- a/tests/texturing/s3tc-texsubimage.c +++ b/tests/texturing/s3tc-texsubimage.c @@ -32,7 +32,7 @@ * used. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, diff --git a/tests/texturing/sampler-cube-shadow.c b/tests/texturing/sampler-cube-shadow.c index 2ae8ed7b4..52994cfcc 100644 --- a/tests/texturing/sampler-cube-shadow.c +++ b/tests/texturing/sampler-cube-shadow.c @@ -32,7 +32,7 @@ * reference value ('q'texture coordinate) */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/texturing/shaders/common.h b/tests/texturing/shaders/common.h index ce1a1a1a1..a4e8cd75e 100644 --- a/tests/texturing/shaders/common.h +++ b/tests/texturing/shaders/common.h @@ -28,7 +28,7 @@ */ #pragma once #define _GNU_SOURCE -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * Texture miplevel info: diff --git a/tests/texturing/sized-texture-format-channels.c b/tests/texturing/sized-texture-format-channels.c index b3f3dc0db..0a6cb1250 100644 --- a/tests/texturing/sized-texture-format-channels.c +++ b/tests/texturing/sized-texture-format-channels.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "sized-internalformats.h" /** diff --git a/tests/texturing/streaming-texture-leak.c b/tests/texturing/streaming-texture-leak.c index 87aac0638..c085a9d24 100644 --- a/tests/texturing/streaming-texture-leak.c +++ b/tests/texturing/streaming-texture-leak.c @@ -36,7 +36,7 @@ * Bug #23530 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/texturing/tex-border-1.c b/tests/texturing/tex-border-1.c index d2f86fe19..a8b8e25ac 100644 --- a/tests/texturing/tex-border-1.c +++ b/tests/texturing/tex-border-1.c @@ -37,7 +37,7 @@ * border colors.). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 50 /*window_width*/, diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c index 7625315d1..ddce3f7a8 100644 --- a/tests/texturing/tex-miplevel-selection.c +++ b/tests/texturing/tex-miplevel-selection.c @@ -30,7 +30,7 @@ * Also tests ARB_shader_texture_lod if requested. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 900 /*window_width*/, diff --git a/tests/texturing/tex-skipped-unit.c b/tests/texturing/tex-skipped-unit.c index ef003641d..e61a6af25 100644 --- a/tests/texturing/tex-skipped-unit.c +++ b/tests/texturing/tex-skipped-unit.c @@ -27,7 +27,7 @@ */ #include "piglit-framework.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define TEXSIZE 32 diff --git a/tests/texturing/tex-srgb.c b/tests/texturing/tex-srgb.c index b055c9bba..655dc73d8 100644 --- a/tests/texturing/tex-srgb.c +++ b/tests/texturing/tex-srgb.c @@ -30,7 +30,7 @@ * Check srgb texturing and EXT_texture_sRGB_decode */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/texturing/tex-swizzle.c b/tests/texturing/tex-swizzle.c index bd230edff..9fa6da925 100644 --- a/tests/texturing/tex-swizzle.c +++ b/tests/texturing/tex-swizzle.c @@ -31,7 +31,7 @@ * swizzling available. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 400 /*window_width*/, diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c index 03d0f478c..452019c9f 100644 --- a/tests/texturing/tex3d-maxsize.c +++ b/tests/texturing/tex3d-maxsize.c @@ -26,7 +26,7 @@ * Tests 3D textures. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/texturing/tex3d-npot.c b/tests/texturing/tex3d-npot.c index 67fd28434..f79b02750 100644 --- a/tests/texturing/tex3d-npot.c +++ b/tests/texturing/tex3d-npot.c @@ -26,7 +26,7 @@ * Tests 3D textures. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c index 272379be2..72d8313b9 100644 --- a/tests/texturing/tex3d.c +++ b/tests/texturing/tex3d.c @@ -26,7 +26,7 @@ * Tests 3D textures. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c index 27b2f15a4..0c77d77ed 100644 --- a/tests/texturing/texdepth.c +++ b/tests/texturing/texdepth.c @@ -8,7 +8,7 @@ * - EXT_shadow_funcs */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define ROWS 4 #define COLS 8 diff --git a/tests/texturing/teximage-errors.c b/tests/texturing/teximage-errors.c index 6a93934b5..5f0497d69 100644 --- a/tests/texturing/teximage-errors.c +++ b/tests/texturing/teximage-errors.c @@ -27,7 +27,7 @@ * Tests glTexImage functions for invalid values, error reporting. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c index 0d4cc26fc..f41a95201 100644 --- a/tests/texturing/texrect-many.c +++ b/tests/texturing/texrect-many.c @@ -6,7 +6,7 @@ * (Prompted by a bug in R300 where the driver ran out of indirections). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 16 * 16 /*window_width*/, diff --git a/tests/texturing/texredefine.c b/tests/texturing/texredefine.c index e495f7fe8..6879689dc 100644 --- a/tests/texturing/texredefine.c +++ b/tests/texturing/texredefine.c @@ -29,7 +29,7 @@ #include <stdarg.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/texturing/texsubimage.c b/tests/texturing/texsubimage.c index d924d6ad5..a92ea92ae 100644 --- a/tests/texturing/texsubimage.c +++ b/tests/texturing/texsubimage.c @@ -32,7 +32,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "../fbo/fbo-formats.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/texturing/texture-al.c b/tests/texturing/texture-al.c index 417981133..339bfaef5 100644 --- a/tests/texturing/texture-al.c +++ b/tests/texturing/texture-al.c @@ -29,7 +29,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=34280 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/texturing/texture-packed-formats.c b/tests/texturing/texture-packed-formats.c index db80d5ab5..9fd597d65 100644 --- a/tests/texturing/texture-packed-formats.c +++ b/tests/texturing/texture-packed-formats.c @@ -37,7 +37,7 @@ #include <stdlib.h> #include <math.h> #include <string.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 700 /*window_width*/, diff --git a/tests/texturing/texture-rg.c b/tests/texturing/texture-rg.c index 614acce59..84a5f9b8d 100644 --- a/tests/texturing/texture-rg.c +++ b/tests/texturing/texture-rg.c @@ -27,7 +27,7 @@ * Tests GL_ARB_texture_rg extension (red/green texture formats) */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/texturing/texwrap.c b/tests/texturing/texwrap.c index 46f1d2dee..2fb63bf16 100644 --- a/tests/texturing/texwrap.c +++ b/tests/texturing/texwrap.c @@ -66,7 +66,7 @@ * 2D GL_RGBA8 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /* Only *_ARB versions of these exist. I am lazy to add the suffix. */ #define GL_ALPHA32F 0x8816 diff --git a/tests/util/CMakeLists.gl.txt b/tests/util/CMakeLists.gl.txt index 7494de3a3..82231497a 100644 --- a/tests/util/CMakeLists.gl.txt +++ b/tests/util/CMakeLists.gl.txt @@ -28,7 +28,7 @@ IF(BUILD_GLX_TESTS) piglit-shader.c piglit-shader-gl.c piglit-transform-feedback.c - piglit-util.c + piglit-util-gl-common.c piglit-util-enum.c piglit-util-gl.c piglit-glx-framework.c diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt index 721e35f79..d56efcc78 100644 --- a/tests/util/CMakeLists.txt +++ b/tests/util/CMakeLists.txt @@ -13,7 +13,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(UTIL_SOURCES fdo-bitmap.c - piglit-util.c + piglit-util-gl-common.c piglit-util-enum.c shader-load.c piglit-framework.c diff --git a/tests/util/minmax-test.c b/tests/util/minmax-test.c index 4fa2d98c0..4d2de363a 100644 --- a/tests/util/minmax-test.c +++ b/tests/util/minmax-test.c @@ -29,7 +29,7 @@ #define _GNU_SOURCE #include <string.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" bool piglit_minmax_pass = true; diff --git a/tests/util/piglit-dispatch-init.c b/tests/util/piglit-dispatch-init.c index 7ad76e213..1430a3630 100644 --- a/tests/util/piglit-dispatch-init.c +++ b/tests/util/piglit-dispatch-init.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #if defined(_WIN32) diff --git a/tests/util/piglit-dispatch.c b/tests/util/piglit-dispatch.c index 48e03ff53..33f93f526 100644 --- a/tests/util/piglit-dispatch.c +++ b/tests/util/piglit-dispatch.c @@ -21,7 +21,7 @@ */ #include "piglit-dispatch.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #ifdef _WIN32 #define inline __inline diff --git a/tests/util/piglit-framework-fbo.c b/tests/util/piglit-framework-fbo.c index d25fce8fc..41333848e 100644 --- a/tests/util/piglit-framework-fbo.c +++ b/tests/util/piglit-framework-fbo.c @@ -41,7 +41,7 @@ #include <stdio.h> #include <stdlib.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #include "piglit-framework-fbo.h" diff --git a/tests/util/piglit-framework-glut.c b/tests/util/piglit-framework-glut.c index bd6fbb798..690299203 100644 --- a/tests/util/piglit-framework-glut.c +++ b/tests/util/piglit-framework-glut.c @@ -27,7 +27,7 @@ #include <stdlib.h> #include <math.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #include "piglit-framework-glut.h" diff --git a/tests/util/piglit-framework.c b/tests/util/piglit-framework.c index 2a0730e9b..301226c29 100644 --- a/tests/util/piglit-framework.c +++ b/tests/util/piglit-framework.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include <math.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #include "piglit-framework-fbo.h" #include "piglit-framework-glut.h" diff --git a/tests/util/piglit-glx-framework.c b/tests/util/piglit-glx-framework.c index 0084d6201..4fed48a1e 100644 --- a/tests/util/piglit-glx-framework.c +++ b/tests/util/piglit-glx-framework.c @@ -25,6 +25,6 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" int piglit_automatic = 0; diff --git a/tests/util/piglit-glx-util.c b/tests/util/piglit-glx-util.c index 069ea72d4..af26c1917 100644 --- a/tests/util/piglit-glx-util.c +++ b/tests/util/piglit-glx-util.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #ifndef GLXBadProfileARB diff --git a/tests/util/piglit-shader-gl.c b/tests/util/piglit-shader-gl.c index e29a07f49..d3eee6784 100644 --- a/tests/util/piglit-shader-gl.c +++ b/tests/util/piglit-shader-gl.c @@ -29,7 +29,7 @@ #include <windows.h> #endif -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PFNGLATTACHSHADERPROC piglit_AttachShader = NULL; PFNGLBINDATTRIBLOCATIONPROC piglit_BindAttribLocation = NULL; diff --git a/tests/util/piglit-shader-gles1.c b/tests/util/piglit-shader-gles1.c index 8f76b043f..6fd7d105a 100644 --- a/tests/util/piglit-shader-gles1.c +++ b/tests/util/piglit-shader-gles1.c @@ -25,7 +25,7 @@ # error USE_OPENGL_ES1 is undefined #endif -#include "piglit-util.h" +#include "piglit-util-gl-common.h" void piglit_require_GLSL(void) diff --git a/tests/util/piglit-shader-gles2.c b/tests/util/piglit-shader-gles2.c index 361973a14..8e85bbd97 100644 --- a/tests/util/piglit-shader-gles2.c +++ b/tests/util/piglit-shader-gles2.c @@ -25,7 +25,7 @@ # error USE_OPENGL_ES2 is undefined #endif -#include "piglit-util.h" +#include "piglit-util-gl-common.h" void piglit_require_GLSL(void) {} void piglit_require_vertex_shader(void) {} diff --git a/tests/util/piglit-shader.c b/tests/util/piglit-shader.c index 3e0f935ee..f097512ac 100644 --- a/tests/util/piglit-shader.c +++ b/tests/util/piglit-shader.c @@ -24,7 +24,7 @@ #include <sys/stat.h> #include <errno.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" void piglit_get_glsl_version(bool *es, int* major, int* minor) { diff --git a/tests/util/piglit-transform-feedback.c b/tests/util/piglit-transform-feedback.c index 4e7f9cc65..d23e126bd 100644 --- a/tests/util/piglit-transform-feedback.c +++ b/tests/util/piglit-transform-feedback.c @@ -29,7 +29,7 @@ #include <windows.h> #endif -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PFNGLBEGINTRANSFORMFEEDBACKPROC piglit_BeginTransformFeedback = NULL; PFNGLBINDBUFFERBASEPROC piglit_BindBufferBase = NULL; diff --git a/tests/util/piglit-util-egl.h b/tests/util/piglit-util-egl.h index 1fa68e573..22f8b1a77 100644 --- a/tests/util/piglit-util-egl.h +++ b/tests/util/piglit-util-egl.h @@ -25,7 +25,7 @@ #include <EGL/egl.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #ifdef __cplusplus extern "C" { diff --git a/tests/util/piglit-util-enum.c b/tests/util/piglit-util-enum.c index 6c6325e5b..5407dd161 100644 --- a/tests/util/piglit-util-enum.c +++ b/tests/util/piglit-util-enum.c @@ -36,7 +36,7 @@ # undef USE_OPENGL_ES2 #endif -#include "piglit-util.h" +#include "piglit-util-gl-common.h" const char * diff --git a/tests/util/piglit-util.c b/tests/util/piglit-util-gl-common.c index 2d367c5f9..a70928d99 100644 --- a/tests/util/piglit-util.c +++ b/tests/util/piglit-util-gl-common.c @@ -39,7 +39,7 @@ #define USE_SETRLIMIT #endif -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #if defined(_WIN32) diff --git a/tests/util/piglit-util.h b/tests/util/piglit-util-gl-common.h index 776406898..6cac7e220 100755..100644 --- a/tests/util/piglit-util.h +++ b/tests/util/piglit-util-gl-common.h @@ -22,8 +22,8 @@ */ #pragma once -#ifndef PIGLIT_UTIL_H -#define PIGLIT_UTIL_H +#ifndef PIGLIT_UTIL_GL_COMMON_H +#define PIGLIT_UTIL_GL_COMMON_H #ifdef __cplusplus extern "C" { @@ -297,4 +297,4 @@ static const GLint PIGLIT_ATTRIB_TEX = 1; } /* end extern "C" */ #endif -#endif /* PIGLIT_UTIL_H */ +#endif /* PIGLIT_UTIL_GL_COMMON_H */ diff --git a/tests/util/piglit-util-gl.c b/tests/util/piglit-util-gl.c index 6cdded548..2f08ba442 100644 --- a/tests/util/piglit-util-gl.c +++ b/tests/util/piglit-util-gl.c @@ -33,7 +33,7 @@ #include <errno.h> #include <sys/stat.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" GLint piglit_ARBfp_pass_through = 0; diff --git a/tests/util/piglit-util-gles.c b/tests/util/piglit-util-gles.c index dd7a21a04..12ae847cd 100644 --- a/tests/util/piglit-util-gles.c +++ b/tests/util/piglit-util-gles.c @@ -33,7 +33,7 @@ #include <errno.h> #include <sys/stat.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * Read a pixel from the given location and compare its RGBA value to the diff --git a/tests/util/piglit-vbo.cpp b/tests/util/piglit-vbo.cpp index eb23e3485..2ff9c61ec 100644 --- a/tests/util/piglit-vbo.cpp +++ b/tests/util/piglit-vbo.cpp @@ -94,7 +94,7 @@ #include <vector> #include <errno.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-vbo.h" /** diff --git a/tests/util/sized-internalformats.c b/tests/util/sized-internalformats.c index 6d8babc94..406aee423 100644 --- a/tests/util/sized-internalformats.c +++ b/tests/util/sized-internalformats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "sized-internalformats.h" #define FORMAT(token, r, g, b, a, l, i, d, s) \ |