diff options
Diffstat (limited to 'tests/shaders')
139 files changed, 139 insertions, 139 deletions
diff --git a/tests/shaders/activeprogram-bad-program.c b/tests/shaders/activeprogram-bad-program.c index 65dfcb33e..ffb2b0a77 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/activeprogram-get.c b/tests/shaders/activeprogram-get.c index 501a0576f..296633c4a 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/ati-fs-bad-delete.c b/tests/shaders/ati-fs-bad-delete.c index 0cdef6ac3..b193da90c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/attribute0.c b/tests/shaders/attribute0.c index a7999f1f3..0bc0c2dfd 100644 --- a/tests/shaders/attribute0.c +++ b/tests/shaders/attribute0.c @@ -27,7 +27,7 @@ * instead of using gl_Vertex. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/built-in-constants.c b/tests/shaders/built-in-constants.c index b1ea97563..567b3be9a 100644 --- a/tests/shaders/built-in-constants.c +++ b/tests/shaders/built-in-constants.c @@ -23,7 +23,7 @@ #include <stdbool.h> #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "parser_utils.h" static void parse_file(const char *filename); diff --git a/tests/shaders/createshaderprogram-attached-shaders.c b/tests/shaders/createshaderprogram-attached-shaders.c index 09316c7fd..9cd6e72ef 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/createshaderprogram-bad-type.c b/tests/shaders/createshaderprogram-bad-type.c index 26e7412ef..2f540f01b 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/fp-abs-01.c b/tests/shaders/fp-abs-01.c index 1c0c43e35..47d4e0f24 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-gl-common.h" +#include "piglit-util-gl.h" #define TEST_ROWS 1 #define TEST_COLS 2 diff --git a/tests/shaders/fp-abs-02.c b/tests/shaders/fp-abs-02.c index d53bc0620..7a546a29e 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-gl-common.h" +#include "piglit-util-gl.h" #define TEST_ROWS 1 #define TEST_COLS 3 diff --git a/tests/shaders/fp-condition_codes-01.c b/tests/shaders/fp-condition_codes-01.c index 5aa32185f..49e3b3d7f 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-gl-common.h" +#include "piglit-util-gl.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 36ad9140c..77efb3927 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-gl-common.h" +#include "piglit-util-gl.h" static GLint prog = 0; diff --git a/tests/shaders/fp-formats.c b/tests/shaders/fp-formats.c index 16cf8761d..fe418fe97 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/fp-fragment-position.c b/tests/shaders/fp-fragment-position.c index adb7f5711..fad97f59d 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/fp-incomplete-tex.c b/tests/shaders/fp-incomplete-tex.c index f7e0b5732..2e68b5544 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/fp-indirections.c b/tests/shaders/fp-indirections.c index f5bcd379c..a25432fa5 100644 --- a/tests/shaders/fp-indirections.c +++ b/tests/shaders/fp-indirections.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/fp-indirections2.c b/tests/shaders/fp-indirections2.c index 6e16c6f88..0b1ee282a 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-gl-common.h" +#include "piglit-util-gl.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 1e472efd3..a29221ca1 100644 --- a/tests/shaders/fp-kil.c +++ b/tests/shaders/fp-kil.c @@ -25,7 +25,7 @@ * Test KIL instruction. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/fp-lit-mask.c b/tests/shaders/fp-lit-mask.c index 3a3854f1b..0daa5eea4 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/fp-lit-src-equals-dst.c b/tests/shaders/fp-lit-src-equals-dst.c index 20a235cad..90e19f4c2 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/fp-long-alu.c b/tests/shaders/fp-long-alu.c index 4aedd2d29..a4e0382bb 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/fp-rfl.c b/tests/shaders/fp-rfl.c index bc16b7596..68cd9b9af 100644 --- a/tests/shaders/fp-rfl.c +++ b/tests/shaders/fp-rfl.c @@ -30,7 +30,7 @@ #include <time.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BOX_SIZE 8 diff --git a/tests/shaders/fp-set-01.c b/tests/shaders/fp-set-01.c index 1188fd0a0..b3879b0e5 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-gl-common.h" +#include "piglit-util-gl.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 13073a771..9995ec941 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-gl-common.h" +#include "piglit-util-gl.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 77571f0f0..eae656ef3 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-gl-common.h" +#include "piglit-util-gl.h" /* There are 128 possible values. These values a distributed into 3 color * components. Ensure that all of the values are seen at least once. diff --git a/tests/shaders/getuniform-01.c b/tests/shaders/getuniform-01.c index 016a6d072..5b7210da0 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/getuniform-02.c b/tests/shaders/getuniform-02.c index 857243253..b0bd86a31 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c index 3cdc7b2fb..bc30a96f1 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions.c b/tests/shaders/glsl-arb-fragment-coord-conventions.c index 51feae93e..32beed4eb 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c index c2101302b..f0c1b69dc 100644 --- a/tests/shaders/glsl-bindattriblocation.c +++ b/tests/shaders/glsl-bindattriblocation.c @@ -39,7 +39,7 @@ * \author Brian Paul */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-bug-22603.c b/tests/shaders/glsl-bug-22603.c index dabfb0111..74aeb7be5 100644 --- a/tests/shaders/glsl-bug-22603.c +++ b/tests/shaders/glsl-bug-22603.c @@ -30,7 +30,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-cos.c b/tests/shaders/glsl-cos.c index 47426046b..aebc7a41a 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-deriv-varyings.c b/tests/shaders/glsl-deriv-varyings.c index 1e043bd02..4ce0984bc 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-gl-common.h" +#include "piglit-util-gl.h" static void compileLinkProg(void); static void loadTex(void); diff --git a/tests/shaders/glsl-derivs.c b/tests/shaders/glsl-derivs.c index 1fe544224..1e805dc21 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-gl-common.h" +#include "piglit-util-gl.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 196c3645a..b90e847e3 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-empty-vs-no-fs.c b/tests/shaders/glsl-empty-vs-no-fs.c index b6ddea1ec..fb77749e5 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-explicit-location-01.c b/tests/shaders/glsl-explicit-location-01.c index 36b965efc..c7883a9b7 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-explicit-location-02.c b/tests/shaders/glsl-explicit-location-02.c index 87bd6c741..08522cabe 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-explicit-location-03.c b/tests/shaders/glsl-explicit-location-03.c index 92962f810..197b900d6 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-explicit-location-04.c b/tests/shaders/glsl-explicit-location-04.c index c4ba2c895..50c54b96c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-explicit-location-05.c b/tests/shaders/glsl-explicit-location-05.c index 7f5527fa9..d393dce17 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-bug25902.c b/tests/shaders/glsl-fs-bug25902.c index 0cb9fc8a1..da7c9048c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-color-matrix.c b/tests/shaders/glsl-fs-color-matrix.c index b9a576961..3b149932b 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-discard-02.c b/tests/shaders/glsl-fs-discard-02.c index 998441d23..2401af53b 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c index b76ea169a..c147c4351 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-flat-color.c b/tests/shaders/glsl-fs-flat-color.c index da80a7e91..9e6f433a2 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-fogcolor-statechange.c b/tests/shaders/glsl-fs-fogcolor-statechange.c index 919092b8e..50b8260ab 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-fogscale.c b/tests/shaders/glsl-fs-fogscale.c index dc398e2fe..e5f28eaf7 100644 --- a/tests/shaders/glsl-fs-fogscale.c +++ b/tests/shaders/glsl-fs-fogscale.c @@ -29,7 +29,7 @@ * takes into account that some GPUs may not have a representation for INF. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c index a8a92516b..b807bb1e0 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c index b178da455..4a411bd32 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-fragcoord.c b/tests/shaders/glsl-fs-fragcoord.c index a6fbb7caa..29b1bca15 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-loop-nested.c b/tests/shaders/glsl-fs-loop-nested.c index 10776360f..881d423c6 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-loop.c b/tests/shaders/glsl-fs-loop.c index 2b38ff17e..d8cec674c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c index d83490e27..09db3d178 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-raytrace-bug27060.c b/tests/shaders/glsl-fs-raytrace-bug27060.c index a0cc343dd..9a720a0e6 100644 --- a/tests/shaders/glsl-fs-raytrace-bug27060.c +++ b/tests/shaders/glsl-fs-raytrace-bug27060.c @@ -22,7 +22,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "glsl-fs-raytrace-bug27060.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-sampler-numbering.c b/tests/shaders/glsl-fs-sampler-numbering.c index 1771ba587..5ba338f3f 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-shader-stencil-export.c b/tests/shaders/glsl-fs-shader-stencil-export.c index 2306909a0..14617987c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-sqrt-branch.c b/tests/shaders/glsl-fs-sqrt-branch.c index 1f15d5959..da3761ce4 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-texture2drect.c b/tests/shaders/glsl-fs-texture2drect.c index 47c4dc62e..bd129b655 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-texturecube-2.c b/tests/shaders/glsl-fs-texturecube-2.c index 177f867a0..c6543e06d 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-gl-common.h" +#include "piglit-util-gl.h" #define SIZE 32 diff --git a/tests/shaders/glsl-fs-texturecube.c b/tests/shaders/glsl-fs-texturecube.c index afdeb37b6..3e3a4ed7a 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-textureenvcolor-statechange.c b/tests/shaders/glsl-fs-textureenvcolor-statechange.c index 9b52c9fce..aedd65774 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fs-user-varying-ff.c b/tests/shaders/glsl-fs-user-varying-ff.c index 4f9b26eb0..686121444 100644 --- a/tests/shaders/glsl-fs-user-varying-ff.c +++ b/tests/shaders/glsl-fs-user-varying-ff.c @@ -28,7 +28,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-fwidth.c b/tests/shaders/glsl-fwidth.c index 7ca9897f6..4f45b6bc2 100644 --- a/tests/shaders/glsl-fwidth.c +++ b/tests/shaders/glsl-fwidth.c @@ -28,7 +28,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-getactiveuniform-array-size.c b/tests/shaders/glsl-getactiveuniform-array-size.c index 7f4ba6120..0b2625f18 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-getactiveuniform-count.c b/tests/shaders/glsl-getactiveuniform-count.c index 6e888e1b2..418b23364 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-getactiveuniform-length.c b/tests/shaders/glsl-getactiveuniform-length.c index 2c596c4c5..9d4519afa 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c index 82880dd66..6a781a2f6 100644 --- a/tests/shaders/glsl-getattriblocation.c +++ b/tests/shaders/glsl-getattriblocation.c @@ -40,7 +40,7 @@ * \author Brian Paul */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-invalid-asm-01.c b/tests/shaders/glsl-invalid-asm-01.c index d611b066c..a1e784f76 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-gl-common.h" +#include "piglit-util-gl.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 73e50af92..108b79488 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-gl-common.h" +#include "piglit-util-gl.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 afd09826d..dd0fb0de4 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-kwin-blur-2.c b/tests/shaders/glsl-kwin-blur-2.c index f692ebdeb..0c03ff800 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-light-model.c b/tests/shaders/glsl-light-model.c index 03e6f6fa5..63b5ce4b1 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-link-bug30552.c b/tests/shaders/glsl-link-bug30552.c index 35d60ee7f..b8871a9bf 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-link-bug38015.c b/tests/shaders/glsl-link-bug38015.c index e90573672..b7d3f3561 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-link-empty-prog-01.c b/tests/shaders/glsl-link-empty-prog-01.c index 21a39453d..88c24d762 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-link-empty-prog-02.c b/tests/shaders/glsl-link-empty-prog-02.c index fe3a65f80..c684047f8 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-link-initializer-03.c b/tests/shaders/glsl-link-initializer-03.c index 8470b4bcf..05edafea9 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-link-test.c b/tests/shaders/glsl-link-test.c index d4faeae6c..df4b5bdba 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-lod-bias.c b/tests/shaders/glsl-lod-bias.c index f18a79f9d..b8e3f9ac8 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-gl-common.h" +#include "piglit-util-gl.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 97e0794e9..d4c643cc0 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-max-varyings.c b/tests/shaders/glsl-max-varyings.c index 12f223d1d..a85d55d3d 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-gl-common.h" +#include "piglit-util-gl.h" #define MAX_VARYING 256 diff --git a/tests/shaders/glsl-max-vertex-attrib.c b/tests/shaders/glsl-max-vertex-attrib.c index 5852a6d1f..c0b582eb4 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-novertexdata.c b/tests/shaders/glsl-novertexdata.c index f9cbcac20..8b5781634 100644 --- a/tests/shaders/glsl-novertexdata.c +++ b/tests/shaders/glsl-novertexdata.c @@ -40,7 +40,7 @@ * \author Brian Paul */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-orangebook-ch06-bump.c b/tests/shaders/glsl-orangebook-ch06-bump.c index f64815c23..5ae748246 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-preprocessor-comments.c b/tests/shaders/glsl-preprocessor-comments.c index f42bb7034..074bafbfd 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-reload-source.c b/tests/shaders/glsl-reload-source.c index adf697795..13e6fb73e 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-routing.c b/tests/shaders/glsl-routing.c index 5a1b5d9f1..6bbc4393c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-sin.c b/tests/shaders/glsl-sin.c index 26c371961..192b4e29a 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-uniform-out-of-bounds-2.c b/tests/shaders/glsl-uniform-out-of-bounds-2.c index 2fc5c8668..c1c47dfb0 100644 --- a/tests/shaders/glsl-uniform-out-of-bounds-2.c +++ b/tests/shaders/glsl-uniform-out-of-bounds-2.c @@ -29,7 +29,7 @@ * \author Frank Henigman <fjhenigman@google.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-uniform-out-of-bounds.c b/tests/shaders/glsl-uniform-out-of-bounds.c index 36f14bc7a..d3ae2f61b 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c index 9031bb978..2bf1ae6b6 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c index c5a6e0963..e5c5397c5 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-useprogram-displaylist.c b/tests/shaders/glsl-useprogram-displaylist.c index 089a15a0f..1284736e6 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-arrays.c b/tests/shaders/glsl-vs-arrays.c index d7191ad94..ce4296c96 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-functions.c b/tests/shaders/glsl-vs-functions.c index cf9bae742..9be3a535b 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-if-bool.c b/tests/shaders/glsl-vs-if-bool.c index 0d30fb499..358207283 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-loop-nested.c b/tests/shaders/glsl-vs-loop-nested.c index 9309589bf..56fcbf1c9 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c index 573e187f4..5d77b1f3f 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-mov-after-deref.c b/tests/shaders/glsl-vs-mov-after-deref.c index c330ec627..6b445607a 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-mvp-statechange.c b/tests/shaders/glsl-vs-mvp-statechange.c index f98521ac4..90a0cfcaa 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-normalscale.c b/tests/shaders/glsl-vs-normalscale.c index 928ddd132..5e5627c18 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-point-size.c b/tests/shaders/glsl-vs-point-size.c index 645654acd..9f5d57f34 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-raytrace-bug26691.c b/tests/shaders/glsl-vs-raytrace-bug26691.c index d2a0c9e43..505c399d5 100644 --- a/tests/shaders/glsl-vs-raytrace-bug26691.c +++ b/tests/shaders/glsl-vs-raytrace-bug26691.c @@ -22,7 +22,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "glsl-vs-raytrace-bug26691.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-statechange-1.c b/tests/shaders/glsl-vs-statechange-1.c index 828d87bb6..9d5875bec 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-texturematrix-1.c b/tests/shaders/glsl-vs-texturematrix-1.c index f70e9f160..d653b0394 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-texturematrix-2.c b/tests/shaders/glsl-vs-texturematrix-2.c index af5270b30..8e68e6082 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/glsl-vs-user-varying-ff.c b/tests/shaders/glsl-vs-user-varying-ff.c index 01e0db2f2..53abef7f4 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/gpu_shader4_attribs.c b/tests/shaders/gpu_shader4_attribs.c index edaadb469..f4de86535 100644 --- a/tests/shaders/gpu_shader4_attribs.c +++ b/tests/shaders/gpu_shader4_attribs.c @@ -30,7 +30,7 @@ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/link-unresolved-function.c b/tests/shaders/link-unresolved-function.c index c0aaf9fad..33f4f55d0 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index a1bd5ee4a..e8ef191ea 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -31,7 +31,7 @@ #include <libgen.h> #endif -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-vbo.h" #include "shader_runner_gles_workarounds.h" diff --git a/tests/shaders/sso-simple.c b/tests/shaders/sso-simple.c index 18cba22fe..89cac8eb8 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/sso-uniforms-01.c b/tests/shaders/sso-uniforms-01.c index 039854814..ee34d0263 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/sso-uniforms-02.c b/tests/shaders/sso-uniforms-02.c index 4f212dce2..7a15c0679 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/sso-user-varying-01.c b/tests/shaders/sso-user-varying-01.c index 0dda17894..0ecdfeb3c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/sso-user-varying-02.c b/tests/shaders/sso-user-varying-02.c index 803153bc5..abead82a7 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/trinity-fp1.c b/tests/shaders/trinity-fp1.c index f65e79256..0ea32ad3c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/useprogram-flushverts-1.c b/tests/shaders/useprogram-flushverts-1.c index 15098c896..9259031b8 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/useprogram-flushverts-2.c b/tests/shaders/useprogram-flushverts-2.c index 88cedc9de..53af1847c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/useprogram-inside-begin.c b/tests/shaders/useprogram-inside-begin.c index 22b4e9723..ea82841f2 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/useprogram-refcount-1.c b/tests/shaders/useprogram-refcount-1.c index 8de46bc4a..73746599a 100644 --- a/tests/shaders/useprogram-refcount-1.c +++ b/tests/shaders/useprogram-refcount-1.c @@ -34,7 +34,7 @@ * Bug #31194 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/useshaderprogram-bad-program.c b/tests/shaders/useshaderprogram-bad-program.c index 1252b47c0..dcc86c3df 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/useshaderprogram-bad-type.c b/tests/shaders/useshaderprogram-bad-type.c index 40167e3cb..1375fe9d5 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/useshaderprogram-flushverts-1.c b/tests/shaders/useshaderprogram-flushverts-1.c index be46055f5..e1593d75e 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/version-mixing.c b/tests/shaders/version-mixing.c index 66110e3da..1948c9ef9 100644 --- a/tests/shaders/version-mixing.c +++ b/tests/shaders/version-mixing.c @@ -51,7 +51,7 @@ * with a geometry shader of another version. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static enum test_type { test_type_interstage, diff --git a/tests/shaders/vp-address-01.c b/tests/shaders/vp-address-01.c index 4246914fa..23b449358 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-gl-common.h" +#include "piglit-util-gl.h" static const GLfloat attrib[] = { 1.0, diff --git a/tests/shaders/vp-address-02.c b/tests/shaders/vp-address-02.c index 4a3bbed1a..0b838dd32 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-gl-common.h" +#include "piglit-util-gl.h" static const GLfloat attrib[] = { 1.0, 1.0, diff --git a/tests/shaders/vp-address-03.c b/tests/shaders/vp-address-03.c index 337802d56..767480924 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-gl-common.h" +#include "piglit-util-gl.h" #define TEST_ROWS 1 #define TEST_COLS 4 diff --git a/tests/shaders/vp-address-04.c b/tests/shaders/vp-address-04.c index 7c19b31f4..981d5590c 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-gl-common.h" +#include "piglit-util-gl.h" static const GLfloat attrib[] = { 0.0, 0.0, diff --git a/tests/shaders/vp-address-05.c b/tests/shaders/vp-address-05.c index 1fedeed7e..1f0674190 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-gl-common.h" +#include "piglit-util-gl.h" #define TEST_ROWS 1 #define TEST_COLS 4 diff --git a/tests/shaders/vp-address-06.c b/tests/shaders/vp-address-06.c index 87ae7a8f4..ba0a347ab 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-gl-common.h" +#include "piglit-util-gl.h" #define TEST_ROWS 1 #define TEST_COLS 2 diff --git a/tests/shaders/vp-bad-program.c b/tests/shaders/vp-bad-program.c index 4a4fefaf1..284192b8c 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/vp-clipdistance-01.c b/tests/shaders/vp-clipdistance-01.c index 0faebf923..227694fdd 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-gl-common.h" +#include "piglit-util-gl.h" #define TEST_ROWS 1 #define TEST_COLS 6 diff --git a/tests/shaders/vp-clipdistance-02.c b/tests/shaders/vp-clipdistance-02.c index 02be88ce8..5da714346 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-gl-common.h" +#include "piglit-util-gl.h" #define TEST_ROWS 1 #define TEST_COLS 6 diff --git a/tests/shaders/vp-clipdistance-03.c b/tests/shaders/vp-clipdistance-03.c index b33fc040b..07d97e831 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-gl-common.h" +#include "piglit-util-gl.h" #define TEST_ROWS 1 #define TEST_COLS 1 diff --git a/tests/shaders/vp-clipdistance-04.c b/tests/shaders/vp-clipdistance-04.c index 0e2b34a1f..6d1dc55b8 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-gl-common.h" +#include "piglit-util-gl.h" #define TEST_ROWS 1 #define TEST_COLS 6 diff --git a/tests/shaders/vp-combined-image-units.c b/tests/shaders/vp-combined-image-units.c index f1193a47b..78fd7b831 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/vp-ignore-input.c b/tests/shaders/vp-ignore-input.c index 23d8302ea..9039338b0 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/vp-max-array.c b/tests/shaders/vp-max-array.c index 057b18d39..d23486363 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-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/shaders/vpfp-generic.cpp b/tests/shaders/vpfp-generic.cpp index 9bf1d3da0..12f679447 100644 --- a/tests/shaders/vpfp-generic.cpp +++ b/tests/shaders/vpfp-generic.cpp @@ -63,7 +63,7 @@ #include <vector> extern "C" { -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" } using namespace std; |