diff options
Diffstat (limited to 'tests/shaders')
142 files changed, 142 insertions, 142 deletions
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; |