diff options
Diffstat (limited to 'tests')
1103 files changed, 1106 insertions, 1106 deletions
diff --git a/tests/asmparsertest/asmparsertest.c b/tests/asmparsertest/asmparsertest.c index 40349db71..4d9f301d9 100644 --- a/tests/asmparsertest/asmparsertest.c +++ b/tests/asmparsertest/asmparsertest.c @@ -23,7 +23,7 @@ #include <ctype.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #ifndef TRUE #define FALSE 0 diff --git a/tests/bugs/crash-cubemap-order.c b/tests/bugs/crash-cubemap-order.c index 00436e181..c6b388273 100644 --- a/tests/bugs/crash-cubemap-order.c +++ b/tests/bugs/crash-cubemap-order.c @@ -6,7 +6,7 @@ * This bug existed in the R300 driver and was triggered by Sauerbraten. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/crash-texparameter-before-teximage.c b/tests/bugs/crash-texparameter-before-teximage.c index dd0e732b6..1842f81fc 100644 --- a/tests/bugs/crash-texparameter-before-teximage.c +++ b/tests/bugs/crash-texparameter-before-teximage.c @@ -7,7 +7,7 @@ * This bug was originally triggered by Glest. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/drawbuffer-modes.c b/tests/bugs/drawbuffer-modes.c index eb50080d2..3fbda2648 100644 --- a/tests/bugs/drawbuffer-modes.c +++ b/tests/bugs/drawbuffer-modes.c @@ -34,7 +34,7 @@ * * \Author Yi Sun <yi.sun@intel.com>, Anuj Phogat <anuj.phogat@gmail.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo10370.c b/tests/bugs/fdo10370.c index 41620e01e..95e3d5678 100644 --- a/tests/bugs/fdo10370.c +++ b/tests/bugs/fdo10370.c @@ -3,7 +3,7 @@ * http://bugs.freedesktop.org/show_bug.cgi?id=10370 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo14575.c b/tests/bugs/fdo14575.c index bca8b766c..b2f780b42 100644 --- a/tests/bugs/fdo14575.c +++ b/tests/bugs/fdo14575.c @@ -30,7 +30,7 @@ * * Tests that the driver doesn't fail when deleting a mapped buffer object. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo20701.c b/tests/bugs/fdo20701.c index ff8ea0db0..b06d81552 100644 --- a/tests/bugs/fdo20701.c +++ b/tests/bugs/fdo20701.c @@ -34,7 +34,7 @@ * passes. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo22540.c b/tests/bugs/fdo22540.c index c3d443932..6687ea300 100644 --- a/tests/bugs/fdo22540.c +++ b/tests/bugs/fdo22540.c @@ -23,7 +23,7 @@ // author: Ben Holmes -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo23489.c b/tests/bugs/fdo23489.c index 16c7c156e..e1bd95c6f 100644 --- a/tests/bugs/fdo23489.c +++ b/tests/bugs/fdo23489.c @@ -3,7 +3,7 @@ * http://bugs.freedesktop.org/show_bug.cgi?id=23489 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo23670-depth_test.c b/tests/bugs/fdo23670-depth_test.c index df135b9b1..86b792f90 100644 --- a/tests/bugs/fdo23670-depth_test.c +++ b/tests/bugs/fdo23670-depth_test.c @@ -24,7 +24,7 @@ * Shuang he <shuang.he@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo23670-drawpix_stencil.c b/tests/bugs/fdo23670-drawpix_stencil.c index d8837dc0e..95cd9ac21 100644 --- a/tests/bugs/fdo23670-drawpix_stencil.c +++ b/tests/bugs/fdo23670-drawpix_stencil.c @@ -24,7 +24,7 @@ * Shuang he <shuang.he@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo24066.c b/tests/bugs/fdo24066.c index 09d897f25..6f6082c70 100644 --- a/tests/bugs/fdo24066.c +++ b/tests/bugs/fdo24066.c @@ -32,7 +32,7 @@ * before a fragment program has been setup. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c index a92be506e..5e89a5a83 100644 --- a/tests/bugs/fdo25614-genmipmap.c +++ b/tests/bugs/fdo25614-genmipmap.c @@ -31,7 +31,7 @@ * \author Ian Romanick */ -#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/bugs/fdo28551.c b/tests/bugs/fdo28551.c index b118b35a7..0be8bee79 100644 --- a/tests/bugs/fdo28551.c +++ b/tests/bugs/fdo28551.c @@ -24,7 +24,7 @@ * Kristian Høgsberg <krh@bitplanet.net> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/fdo31934.c b/tests/bugs/fdo31934.c index 341c0c493..2111105c6 100644 --- a/tests/bugs/fdo31934.c +++ b/tests/bugs/fdo31934.c @@ -1,4 +1,4 @@ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c index d6d1d3a04..1f1b0a4f9 100644 --- a/tests/bugs/point-sprite.c +++ b/tests/bugs/point-sprite.c @@ -28,7 +28,7 @@ * \author Ben Holmes */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BOX_SIZE 64 #define TEST_COLS 6 diff --git a/tests/bugs/r300-readcache.c b/tests/bugs/r300-readcache.c index a077f128e..fc6f3b019 100644 --- a/tests/bugs/r300-readcache.c +++ b/tests/bugs/r300-readcache.c @@ -15,7 +15,7 @@ * so this test is always automatic. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/tex1d-2dborder.c b/tests/bugs/tex1d-2dborder.c index 78b8e8931..5b626334a 100644 --- a/tests/bugs/tex1d-2dborder.c +++ b/tests/bugs/tex1d-2dborder.c @@ -30,7 +30,7 @@ * 2D textures, which caused incorrect sampling of border colors. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/tri-tex-crash.c b/tests/bugs/tri-tex-crash.c index 054f58c72..0739fb398 100644 --- a/tests/bugs/tri-tex-crash.c +++ b/tests/bugs/tri-tex-crash.c @@ -28,7 +28,7 @@ * LLVMpipe crash which only seems to happen when SSE4.1 is not used. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/bugs/vbo-buffer-unmap.c b/tests/bugs/vbo-buffer-unmap.c index 7336cc10c..ab64bd891 100644 --- a/tests/bugs/vbo-buffer-unmap.c +++ b/tests/bugs/vbo-buffer-unmap.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/egl/egl-create-surface.c b/tests/egl/egl-create-surface.c index 0f3eec2bf..8954b1eff 100644 --- a/tests/egl/egl-create-surface.c +++ b/tests/egl/egl-create-surface.c @@ -34,7 +34,7 @@ * error is generated. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "egl-util.h" static enum piglit_result diff --git a/tests/egl/egl-nok-swap-region.c b/tests/egl/egl-nok-swap-region.c index e7b8cebbd..4d2734d84 100644 --- a/tests/egl/egl-nok-swap-region.c +++ b/tests/egl/egl-nok-swap-region.c @@ -28,7 +28,7 @@ * Test EGL_NOK_swap_region. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "egl-util.h" #ifdef EGL_NOK_swap_region diff --git a/tests/egl/egl-nok-texture-from-pixmap.c b/tests/egl/egl-nok-texture-from-pixmap.c index 2e96a4a96..9e109338e 100644 --- a/tests/egl/egl-nok-texture-from-pixmap.c +++ b/tests/egl/egl-nok-texture-from-pixmap.c @@ -28,7 +28,7 @@ * Test EGL_NOK_texture_from_pixmap */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "egl-util.h" #ifdef EGL_NOK_texture_from_pixmap diff --git a/tests/egl/egl-util.c b/tests/egl/egl-util.c index 85d3dd951..5b36d6d8c 100644 --- a/tests/egl/egl-util.c +++ b/tests/egl/egl-util.c @@ -31,7 +31,7 @@ */ #include <X11/XKBlib.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "egl-util.h" static int automatic; diff --git a/tests/egl/spec/egl_chromium_sync_control/egl_chromium_sync_control.c b/tests/egl/spec/egl_chromium_sync_control/egl_chromium_sync_control.c index 9daf0f915..2df2a52ca 100644 --- a/tests/egl/spec/egl_chromium_sync_control/egl_chromium_sync_control.c +++ b/tests/egl/spec/egl_chromium_sync_control/egl_chromium_sync_control.c @@ -37,7 +37,7 @@ #include <time.h> #include "piglit-util-egl.h" -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "../../egl-util.h" /* Piglit extension function pointer. */ diff --git a/tests/egl/spec/egl_khr_create_context/common.h b/tests/egl/spec/egl_khr_create_context/common.h index 7aabe7b28..f4f42760c 100644 --- a/tests/egl/spec/egl_khr_create_context/common.h +++ b/tests/egl/spec/egl_khr_create_context/common.h @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <X11/Xlib.h> #include <EGL/egl.h> #include <EGL/eglext.h> diff --git a/tests/egl/spec/egl_khr_create_context/core-profile.c b/tests/egl/spec/egl_khr_create_context/core-profile.c index 85f4d2aaf..0b3f04aa6 100644 --- a/tests/egl/spec/egl_khr_create_context/core-profile.c +++ b/tests/egl/spec/egl_khr_create_context/core-profile.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-egl.h" #include "common.h" diff --git a/tests/egl/spec/egl_khr_create_context/default-major-version-gl.c b/tests/egl/spec/egl_khr_create_context/default-major-version-gl.c index 1162d7b56..993ee4a10 100644 --- a/tests/egl/spec/egl_khr_create_context/default-major-version-gl.c +++ b/tests/egl/spec/egl_khr_create_context/default-major-version-gl.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" int main(int argc, char **argv) diff --git a/tests/egl/spec/egl_khr_create_context/default-major-version-gles.c b/tests/egl/spec/egl_khr_create_context/default-major-version-gles.c index 00c28d1cb..a6af4b1f9 100644 --- a/tests/egl/spec/egl_khr_create_context/default-major-version-gles.c +++ b/tests/egl/spec/egl_khr_create_context/default-major-version-gles.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" int main(int argc, char **argv) diff --git a/tests/egl/spec/egl_khr_create_context/default-minor-version-gl.c b/tests/egl/spec/egl_khr_create_context/default-minor-version-gl.c index 37369d591..a6a56ec8b 100644 --- a/tests/egl/spec/egl_khr_create_context/default-minor-version-gl.c +++ b/tests/egl/spec/egl_khr_create_context/default-minor-version-gl.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" int main(int argc, char **argv) diff --git a/tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c b/tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c index 6101ad705..e35526ad0 100644 --- a/tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c +++ b/tests/egl/spec/egl_khr_create_context/default-minor-version-gles.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" int main(int argc, char **argv) diff --git a/tests/egl/spec/egl_khr_create_context/invalid-attribute-gl.c b/tests/egl/spec/egl_khr_create_context/invalid-attribute-gl.c index d1c99ab0e..e7261bdd8 100644 --- a/tests/egl/spec/egl_khr_create_context/invalid-attribute-gl.c +++ b/tests/egl/spec/egl_khr_create_context/invalid-attribute-gl.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-egl.h" #include "common.h" diff --git a/tests/egl/spec/egl_khr_create_context/invalid-attribute-gles.c b/tests/egl/spec/egl_khr_create_context/invalid-attribute-gles.c index ccee25b36..7d23e5673 100644 --- a/tests/egl/spec/egl_khr_create_context/invalid-attribute-gles.c +++ b/tests/egl/spec/egl_khr_create_context/invalid-attribute-gles.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-egl.h" #include "common.h" diff --git a/tests/egl/spec/egl_khr_create_context/invalid-flag-gl.c b/tests/egl/spec/egl_khr_create_context/invalid-flag-gl.c index ce4fe2d0d..b2af73830 100644 --- a/tests/egl/spec/egl_khr_create_context/invalid-flag-gl.c +++ b/tests/egl/spec/egl_khr_create_context/invalid-flag-gl.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-egl.h" #include "common.h" diff --git a/tests/egl/spec/egl_khr_create_context/invalid-flag-gles.c b/tests/egl/spec/egl_khr_create_context/invalid-flag-gles.c index 9674ae39f..536937721 100644 --- a/tests/egl/spec/egl_khr_create_context/invalid-flag-gles.c +++ b/tests/egl/spec/egl_khr_create_context/invalid-flag-gles.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-egl.h" #include "common.h" diff --git a/tests/egl/spec/egl_khr_create_context/invalid-gl-version.c b/tests/egl/spec/egl_khr_create_context/invalid-gl-version.c index 680b70b0b..54b2c2b0d 100644 --- a/tests/egl/spec/egl_khr_create_context/invalid-gl-version.c +++ b/tests/egl/spec/egl_khr_create_context/invalid-gl-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-egl.h" #include "common.h" diff --git a/tests/egl/spec/egl_khr_create_context/invalid-profile.c b/tests/egl/spec/egl_khr_create_context/invalid-profile.c index fe4f42932..23c527854 100644 --- a/tests/egl/spec/egl_khr_create_context/invalid-profile.c +++ b/tests/egl/spec/egl_khr_create_context/invalid-profile.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-egl.h" #include "common.h" diff --git a/tests/egl/spec/egl_khr_create_context/pre-GL32-profile.c b/tests/egl/spec/egl_khr_create_context/pre-GL32-profile.c index 77585a5c2..66f244491 100644 --- a/tests/egl/spec/egl_khr_create_context/pre-GL32-profile.c +++ b/tests/egl/spec/egl_khr_create_context/pre-GL32-profile.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" static bool try_version(int major, int minor) diff --git a/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gl.c b/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gl.c index 5e1ebb34b..71a12a8b4 100644 --- a/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gl.c +++ b/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gl.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" int main(int argc, char **argv) diff --git a/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gles.c b/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gles.c index 1a878a80d..f370112c2 100644 --- a/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gles.c +++ b/tests/egl/spec/egl_khr_create_context/valid-attribute-empty-gles.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" int main(int argc, char **argv) diff --git a/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gl.c b/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gl.c index d3ff85160..e3870ec4c 100644 --- a/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gl.c +++ b/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gl.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" int main(int argc, char **argv) diff --git a/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c b/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c index 204228323..4759702dc 100644 --- a/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c +++ b/tests/egl/spec/egl_khr_create_context/valid-attribute-null-gles.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" int main(int argc, char **argv) diff --git a/tests/egl/spec/egl_khr_create_context/valid-flag-debug.c b/tests/egl/spec/egl_khr_create_context/valid-flag-debug.c index 1473b4466..2c25d4847 100644 --- a/tests/egl/spec/egl_khr_create_context/valid-flag-debug.c +++ b/tests/egl/spec/egl_khr_create_context/valid-flag-debug.c @@ -48,7 +48,7 @@ */ #include "piglit-util-egl.h" -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" const char *progname; diff --git a/tests/egl/spec/egl_khr_create_context/valid-flag-forward-compatible-gl.c b/tests/egl/spec/egl_khr_create_context/valid-flag-forward-compatible-gl.c index 7f0f148a0..42feb54d6 100644 --- a/tests/egl/spec/egl_khr_create_context/valid-flag-forward-compatible-gl.c +++ b/tests/egl/spec/egl_khr_create_context/valid-flag-forward-compatible-gl.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-egl.h" #include "common.h" diff --git a/tests/egl/spec/egl_khr_create_context/verify-gl-flavor.c b/tests/egl/spec/egl_khr_create_context/verify-gl-flavor.c index 27ea0b18f..a55d10829 100644 --- a/tests/egl/spec/egl_khr_create_context/verify-gl-flavor.c +++ b/tests/egl/spec/egl_khr_create_context/verify-gl-flavor.c @@ -64,7 +64,7 @@ #include <ctype.h> #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-egl.h" #include "common.h" diff --git a/tests/egl/spec/egl_khr_fence_sync/egl_khr_fence_sync.c b/tests/egl/spec/egl_khr_fence_sync/egl_khr_fence_sync.c index 420b28bed..707083aba 100644 --- a/tests/egl/spec/egl_khr_fence_sync/egl_khr_fence_sync.c +++ b/tests/egl/spec/egl_khr_fence_sync/egl_khr_fence_sync.c @@ -54,7 +54,7 @@ #endif #include "piglit-util-egl.h" -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /* Extension function pointers. * diff --git a/tests/fast_color_clear/blit-between-clears.c b/tests/fast_color_clear/blit-between-clears.c index c730d5e8e..12c23e718 100644 --- a/tests/fast_color_clear/blit-between-clears.c +++ b/tests/fast_color_clear/blit-between-clears.c @@ -31,7 +31,7 @@ * color clear will take effect. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define RB_WIDTH 512 #define RB_HEIGHT 512 diff --git a/tests/fast_color_clear/front-buffer-distraction.c b/tests/fast_color_clear/front-buffer-distraction.c index 14e9aef55..c8e059b30 100644 --- a/tests/fast_color_clear/front-buffer-distraction.c +++ b/tests/fast_color_clear/front-buffer-distraction.c @@ -38,7 +38,7 @@ * (forcing a back buffer resolve). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 11; diff --git a/tests/fast_color_clear/read-after-clear.c b/tests/fast_color_clear/read-after-clear.c index d635fd23d..98c716969 100644 --- a/tests/fast_color_clear/read-after-clear.c +++ b/tests/fast_color_clear/read-after-clear.c @@ -48,7 +48,7 @@ * buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 512 #define TEX_HEIGHT 512 diff --git a/tests/fast_color_clear/read-to-pbo-after-clear.c b/tests/fast_color_clear/read-to-pbo-after-clear.c index 41dc4fec0..522b53a4e 100644 --- a/tests/fast_color_clear/read-to-pbo-after-clear.c +++ b/tests/fast_color_clear/read-to-pbo-after-clear.c @@ -36,7 +36,7 @@ * PBO into CPU memory and verifies that it contains green. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 512 #define TEX_HEIGHT 512 diff --git a/tests/fbo/fbo-1d.c b/tests/fbo/fbo-1d.c index 80da57f0d..382febfac 100644 --- a/tests/fbo/fbo-1d.c +++ b/tests/fbo/fbo-1d.c @@ -31,7 +31,7 @@ * succeeds. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 diff --git a/tests/fbo/fbo-3d.c b/tests/fbo/fbo-3d.c index af0c0ae08..4848f2bfa 100644 --- a/tests/fbo/fbo-3d.c +++ b/tests/fbo/fbo-3d.c @@ -31,7 +31,7 @@ * of those individual depths to the window system framebuffer succeeds. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 #define BUF_HEIGHT 32 diff --git a/tests/fbo/fbo-alpha.c b/tests/fbo/fbo-alpha.c index 6218bcd24..48da04c47 100644 --- a/tests/fbo/fbo-alpha.c +++ b/tests/fbo/fbo-alpha.c @@ -31,7 +31,7 @@ * GL_ARB_framebuffer_object. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-alphatest-formats.c b/tests/fbo/fbo-alphatest-formats.c index ab2ea0333..a51d66c4b 100644 --- a/tests/fbo/fbo-alphatest-formats.c +++ b/tests/fbo/fbo-alphatest-formats.c @@ -27,7 +27,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "fbo-formats.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-alphatest-nocolor-ff.c b/tests/fbo/fbo-alphatest-nocolor-ff.c index e62d8441c..e04a62605 100644 --- a/tests/fbo/fbo-alphatest-nocolor-ff.c +++ b/tests/fbo/fbo-alphatest-nocolor-ff.c @@ -28,7 +28,7 @@ * testing correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 diff --git a/tests/fbo/fbo-alphatest-nocolor.c b/tests/fbo/fbo-alphatest-nocolor.c index 452cca372..0294a18b3 100644 --- a/tests/fbo/fbo-alphatest-nocolor.c +++ b/tests/fbo/fbo-alphatest-nocolor.c @@ -27,7 +27,7 @@ * and alpha testing enabled does the alpha testing correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 diff --git a/tests/fbo/fbo-array.c b/tests/fbo/fbo-array.c index a424c302b..6f1e8775c 100644 --- a/tests/fbo/fbo-array.c +++ b/tests/fbo/fbo-array.c @@ -33,7 +33,7 @@ * based on fbo-3d.c and array-texture.c */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 #define BUF_HEIGHT 32 diff --git a/tests/fbo/fbo-bind-renderbuffer.c b/tests/fbo/fbo-bind-renderbuffer.c index 651bc5c48..ce7646a0b 100644 --- a/tests/fbo/fbo-bind-renderbuffer.c +++ b/tests/fbo/fbo-bind-renderbuffer.c @@ -37,7 +37,7 @@ * GL_RENDERBUFFER_EXT, rb); */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-blending-formats.c b/tests/fbo/fbo-blending-formats.c index 725be69a4..3e6acd2d4 100644 --- a/tests/fbo/fbo-blending-formats.c +++ b/tests/fbo/fbo-blending-formats.c @@ -27,7 +27,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "fbo-formats.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-blit-d24s8.c b/tests/fbo/fbo-blit-d24s8.c index 26500d7b3..dcee91848 100644 --- a/tests/fbo/fbo-blit-d24s8.c +++ b/tests/fbo/fbo-blit-d24s8.c @@ -36,7 +36,7 @@ * See also fbo-blit.c */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-blit-stretch.cpp b/tests/fbo/fbo-blit-stretch.cpp index 110978355..8235ec427 100644 --- a/tests/fbo/fbo-blit-stretch.cpp +++ b/tests/fbo/fbo-blit-stretch.cpp @@ -38,7 +38,7 @@ #include <algorithm> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /* diff --git a/tests/fbo/fbo-blit.c b/tests/fbo/fbo-blit.c index 845ed7df2..79b302089 100644 --- a/tests/fbo/fbo-blit.c +++ b/tests/fbo/fbo-blit.c @@ -34,7 +34,7 @@ * See also fbo-readdrawpix.c and fbo-copypix.c */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-clear-formats.c b/tests/fbo/fbo-clear-formats.c index 899997aec..e4413bb65 100644 --- a/tests/fbo/fbo-clear-formats.c +++ b/tests/fbo/fbo-clear-formats.c @@ -31,7 +31,7 @@ * texture-based FBOs of various internalformats. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "fbo-formats.h" #define TEX_WIDTH 256 diff --git a/tests/fbo/fbo-clearmipmap.c b/tests/fbo/fbo-clearmipmap.c index acd03cb36..7b066c03f 100644 --- a/tests/fbo/fbo-clearmipmap.c +++ b/tests/fbo/fbo-clearmipmap.c @@ -32,7 +32,7 @@ * Catches a 965 driver bug that idr ran into trying to write an app. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-colormask-formats.c b/tests/fbo/fbo-colormask-formats.c index 940ac3f0b..2f23d4d3e 100644 --- a/tests/fbo/fbo-colormask-formats.c +++ b/tests/fbo/fbo-colormask-formats.c @@ -26,7 +26,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "fbo-formats.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-copypix.c b/tests/fbo/fbo-copypix.c index 2b4b6a61d..a3ae5633a 100644 --- a/tests/fbo/fbo-copypix.c +++ b/tests/fbo/fbo-copypix.c @@ -31,7 +31,7 @@ * See also fbo-blit.c and fbo-readdrawpix.c */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-copyteximage-simple.c b/tests/fbo/fbo-copyteximage-simple.c index 4cb36de5a..511b97b69 100644 --- a/tests/fbo/fbo-copyteximage-simple.c +++ b/tests/fbo/fbo-copyteximage-simple.c @@ -33,7 +33,7 @@ * into another texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/fbo/fbo-copyteximage.c b/tests/fbo/fbo-copyteximage.c index 7ebbf342e..e0b47f7e3 100644 --- a/tests/fbo/fbo-copyteximage.c +++ b/tests/fbo/fbo-copyteximage.c @@ -31,7 +31,7 @@ * This tries to catch a bug with the Intel driver and texture tiling. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 254 #define TEX_HEIGHT 254 diff --git a/tests/fbo/fbo-cubemap.c b/tests/fbo/fbo-cubemap.c index d96b8804d..2eb45afc9 100644 --- a/tests/fbo/fbo-cubemap.c +++ b/tests/fbo/fbo-cubemap.c @@ -31,7 +31,7 @@ * of those faces to the window system framebuffer succeeds. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 #define BUF_HEIGHT 32 diff --git a/tests/fbo/fbo-depth-array.c b/tests/fbo/fbo-depth-array.c index f89e6e51f..c047057bf 100644 --- a/tests/fbo/fbo-depth-array.c +++ b/tests/fbo/fbo-depth-array.c @@ -36,7 +36,7 @@ * based on fbo-array.c */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 #define BUF_HEIGHT 32 diff --git a/tests/fbo/fbo-depth-sample-compare.c b/tests/fbo/fbo-depth-sample-compare.c index 10b850692..72f7d0054 100644 --- a/tests/fbo/fbo-depth-sample-compare.c +++ b/tests/fbo/fbo-depth-sample-compare.c @@ -37,7 +37,7 @@ #include <assert.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #if defined(__APPLE__) # include <OpenGL/glu.h> diff --git a/tests/fbo/fbo-depth-tex1d.c b/tests/fbo/fbo-depth-tex1d.c index 0e43de60f..e4df8ecfd 100644 --- a/tests/fbo/fbo-depth-tex1d.c +++ b/tests/fbo/fbo-depth-tex1d.c @@ -32,7 +32,7 @@ * and then drawing both to the framebuffer succeeds. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 16 diff --git a/tests/fbo/fbo-depth.c b/tests/fbo/fbo-depth.c index 532c6dbc8..196c51f81 100644 --- a/tests/fbo/fbo-depth.c +++ b/tests/fbo/fbo-depth.c @@ -28,7 +28,7 @@ * with depth buffers. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_SIZE 123 diff --git a/tests/fbo/fbo-depthstencil.c b/tests/fbo/fbo-depthstencil.c index d67cee754..43a308041 100644 --- a/tests/fbo/fbo-depthstencil.c +++ b/tests/fbo/fbo-depthstencil.c @@ -28,7 +28,7 @@ * with depth-stencil buffers. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_SIZE 123 diff --git a/tests/fbo/fbo-depthtex.c b/tests/fbo/fbo-depthtex.c index 69aa4b3aa..e60a5327c 100644 --- a/tests/fbo/fbo-depthtex.c +++ b/tests/fbo/fbo-depthtex.c @@ -29,7 +29,7 @@ * depth texture would be created before the draw to that texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-deriv.c b/tests/fbo/fbo-deriv.c index 3a5d23914..58e94b61a 100644 --- a/tests/fbo/fbo-deriv.c +++ b/tests/fbo/fbo-deriv.c @@ -43,7 +43,7 @@ * framebuffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-draw-buffers-blend.c b/tests/fbo/fbo-draw-buffers-blend.c index 8d70b3dc2..dd310a0ec 100644 --- a/tests/fbo/fbo-draw-buffers-blend.c +++ b/tests/fbo/fbo-draw-buffers-blend.c @@ -32,7 +32,7 @@ * Test GL_ARB_draw_buffers_blend extension (per-buffer blend state) */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-drawbuffers-arbfp.c b/tests/fbo/fbo-drawbuffers-arbfp.c index 6ff86e2c5..e5b2117b4 100644 --- a/tests/fbo/fbo-drawbuffers-arbfp.c +++ b/tests/fbo/fbo-drawbuffers-arbfp.c @@ -32,7 +32,7 @@ * ARB_draw_buffers and ARB_fragment_program works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-drawbuffers-blend-add.c b/tests/fbo/fbo-drawbuffers-blend-add.c index 16313ab63..b045f2379 100644 --- a/tests/fbo/fbo-drawbuffers-blend-add.c +++ b/tests/fbo/fbo-drawbuffers-blend-add.c @@ -32,7 +32,7 @@ */ #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-drawbuffers-fragcolor.c b/tests/fbo/fbo-drawbuffers-fragcolor.c index 1d79bee48..1e75ded4a 100644 --- a/tests/fbo/fbo-drawbuffers-fragcolor.c +++ b/tests/fbo/fbo-drawbuffers-fragcolor.c @@ -32,7 +32,7 @@ */ #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-drawbuffers-maxtargets.c b/tests/fbo/fbo-drawbuffers-maxtargets.c index de1233084..795d039e7 100644 --- a/tests/fbo/fbo-drawbuffers-maxtargets.c +++ b/tests/fbo/fbo-drawbuffers-maxtargets.c @@ -32,7 +32,7 @@ */ #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-drawbuffers.c b/tests/fbo/fbo-drawbuffers.c index 1fdc2a86a..4b72f27b5 100644 --- a/tests/fbo/fbo-drawbuffers.c +++ b/tests/fbo/fbo-drawbuffers.c @@ -31,7 +31,7 @@ * ARB_draw_buffers and fixed function fragment works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-drawbuffers2-blend.c b/tests/fbo/fbo-drawbuffers2-blend.c index 0a494aa57..4702137d1 100644 --- a/tests/fbo/fbo-drawbuffers2-blend.c +++ b/tests/fbo/fbo-drawbuffers2-blend.c @@ -31,7 +31,7 @@ * EXT_draw_buffers2 works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-drawbuffers2-colormask.c b/tests/fbo/fbo-drawbuffers2-colormask.c index 36cdd60df..84d1ac80c 100644 --- a/tests/fbo/fbo-drawbuffers2-colormask.c +++ b/tests/fbo/fbo-drawbuffers2-colormask.c @@ -31,7 +31,7 @@ * EXT_draw_buffers2 works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-finish-deleted.c b/tests/fbo/fbo-finish-deleted.c index 463352056..489565765 100644 --- a/tests/fbo/fbo-finish-deleted.c +++ b/tests/fbo/fbo-finish-deleted.c @@ -29,7 +29,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=34656 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 #define BUF_HEIGHT 32 diff --git a/tests/fbo/fbo-flushing-2.c b/tests/fbo/fbo-flushing-2.c index c3ec5c9a5..011b4d66b 100644 --- a/tests/fbo/fbo-flushing-2.c +++ b/tests/fbo/fbo-flushing-2.c @@ -35,7 +35,7 @@ * had been removed. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 8 #define TEX_HEIGHT 8 diff --git a/tests/fbo/fbo-flushing.c b/tests/fbo/fbo-flushing.c index cc201536e..8bb1290e4 100644 --- a/tests/fbo/fbo-flushing.c +++ b/tests/fbo/fbo-flushing.c @@ -35,7 +35,7 @@ * removed. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 128 #define TEX_HEIGHT 128 diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c index 77a3c630f..e18e24dab 100644 --- a/tests/fbo/fbo-fragcoord.c +++ b/tests/fbo/fbo-fragcoord.c @@ -26,7 +26,7 @@ * Tests that gl_FragCoord produces the expected output in a fragment shader. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define WIDTH 256 #define HEIGHT 256 diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c index 21f1413fe..34a5c6cf7 100644 --- a/tests/fbo/fbo-fragcoord2.c +++ b/tests/fbo/fbo-fragcoord2.c @@ -30,7 +30,7 @@ * Author: Brian Paul */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-generatemipmap-1d.c b/tests/fbo/fbo-generatemipmap-1d.c index ef099d9e2..8561bb1a9 100644 --- a/tests/fbo/fbo-generatemipmap-1d.c +++ b/tests/fbo/fbo-generatemipmap-1d.c @@ -28,7 +28,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_SIZE 128 #define TEX_LEVELS 8 diff --git a/tests/fbo/fbo-generatemipmap-3d.c b/tests/fbo/fbo-generatemipmap-3d.c index 996904492..f1754322c 100644 --- a/tests/fbo/fbo-generatemipmap-3d.c +++ b/tests/fbo/fbo-generatemipmap-3d.c @@ -24,7 +24,7 @@ * Marek Olšák <maraeo@gmail.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_SIZE 32 #define TEX_LEVELS 6 diff --git a/tests/fbo/fbo-generatemipmap-array.c b/tests/fbo/fbo-generatemipmap-array.c index f95a07142..be3c49818 100644 --- a/tests/fbo/fbo-generatemipmap-array.c +++ b/tests/fbo/fbo-generatemipmap-array.c @@ -33,7 +33,7 @@ * Tests that glGenerateMipmapEXT works correctly on level of a 2D array texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 128 #define TEX_HEIGHT 128 diff --git a/tests/fbo/fbo-generatemipmap-cubemap.c b/tests/fbo/fbo-generatemipmap-cubemap.c index 7796eb8f0..60b67db0a 100644 --- a/tests/fbo/fbo-generatemipmap-cubemap.c +++ b/tests/fbo/fbo-generatemipmap-cubemap.c @@ -24,7 +24,7 @@ * Marek Olšák <maraeo@gmail.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_SIZE 32 #define TEX_HALF (TEX_SIZE / 2) diff --git a/tests/fbo/fbo-generatemipmap-filtering.c b/tests/fbo/fbo-generatemipmap-filtering.c index 33f32374c..c202a1e03 100644 --- a/tests/fbo/fbo-generatemipmap-filtering.c +++ b/tests/fbo/fbo-generatemipmap-filtering.c @@ -26,7 +26,7 @@ * Tests that glGenerateMipmapEXT uses appropriate filtering for a 2D texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/fbo/fbo-generatemipmap-formats.c b/tests/fbo/fbo-generatemipmap-formats.c index 8c171888b..c7b01fb64 100644 --- a/tests/fbo/fbo-generatemipmap-formats.c +++ b/tests/fbo/fbo-generatemipmap-formats.c @@ -31,7 +31,7 @@ * internalformats. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "fbo-formats.h" static bool npot; diff --git a/tests/fbo/fbo-generatemipmap-noimage.c b/tests/fbo/fbo-generatemipmap-noimage.c index 99cc60b99..6c5414f1c 100644 --- a/tests/fbo/fbo-generatemipmap-noimage.c +++ b/tests/fbo/fbo-generatemipmap-noimage.c @@ -29,7 +29,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=40308 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-generatemipmap-nonsquare.c b/tests/fbo/fbo-generatemipmap-nonsquare.c index 755f5ff8a..7a1ec1950 100644 --- a/tests/fbo/fbo-generatemipmap-nonsquare.c +++ b/tests/fbo/fbo-generatemipmap-nonsquare.c @@ -32,7 +32,7 @@ * Modified by Marek Olšák <maraeo@gmail.com> to reproduce FDO bug #27338. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 256 #define TEX_HEIGHT 64 diff --git a/tests/fbo/fbo-generatemipmap-npot.c b/tests/fbo/fbo-generatemipmap-npot.c index 938eba46d..6ea874605 100644 --- a/tests/fbo/fbo-generatemipmap-npot.c +++ b/tests/fbo/fbo-generatemipmap-npot.c @@ -30,7 +30,7 @@ * Tests that glGenerateMipmapEXT works correctly on a 2D texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 254 #define TEX_HEIGHT 254 diff --git a/tests/fbo/fbo-generatemipmap-scissor.c b/tests/fbo/fbo-generatemipmap-scissor.c index 2d3797c5e..d08850a55 100644 --- a/tests/fbo/fbo-generatemipmap-scissor.c +++ b/tests/fbo/fbo-generatemipmap-scissor.c @@ -33,7 +33,7 @@ * Compare this test to fbo-generatemipmap.c. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/fbo/fbo-generatemipmap-swizzle.c b/tests/fbo/fbo-generatemipmap-swizzle.c index 5ecb120c6..4b80df4f3 100644 --- a/tests/fbo/fbo-generatemipmap-swizzle.c +++ b/tests/fbo/fbo-generatemipmap-swizzle.c @@ -34,7 +34,7 @@ * Compare this test to fbo-generatemipmap.c. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/fbo/fbo-generatemipmap-viewport.c b/tests/fbo/fbo-generatemipmap-viewport.c index 7422947a7..4e94d56bd 100644 --- a/tests/fbo/fbo-generatemipmap-viewport.c +++ b/tests/fbo/fbo-generatemipmap-viewport.c @@ -34,7 +34,7 @@ * Pierre Willenbrock <pierre@pirsoft.de>. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/fbo/fbo-generatemipmap.c b/tests/fbo/fbo-generatemipmap.c index 6f4f46a83..656b0d4d4 100644 --- a/tests/fbo/fbo-generatemipmap.c +++ b/tests/fbo/fbo-generatemipmap.c @@ -30,7 +30,7 @@ * Tests that glGenerateMipmapEXT works correctly on a 2D texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/fbo/fbo-getframebufferattachmentparameter-01.c b/tests/fbo/fbo-getframebufferattachmentparameter-01.c index 7e0e2594d..e365d5fa0 100644 --- a/tests/fbo/fbo-getframebufferattachmentparameter-01.c +++ b/tests/fbo/fbo-getframebufferattachmentparameter-01.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-gl_pointcoord.c b/tests/fbo/fbo-gl_pointcoord.c index 09b5b88e1..f2741f5eb 100644 --- a/tests/fbo/fbo-gl_pointcoord.c +++ b/tests/fbo/fbo-gl_pointcoord.c @@ -28,7 +28,7 @@ * Verify that applications can use point coordinate correctly with FBO. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-incomplete-invalid-texture.c b/tests/fbo/fbo-incomplete-invalid-texture.c index 56fa75eeb..cd8adafd9 100644 --- a/tests/fbo/fbo-incomplete-invalid-texture.c +++ b/tests/fbo/fbo-incomplete-invalid-texture.c @@ -27,7 +27,7 @@ * FBO, the unbind and rebind the FBO. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-incomplete-texture-01.c b/tests/fbo/fbo-incomplete-texture-01.c index 67257901b..b22ff0490 100644 --- a/tests/fbo/fbo-incomplete-texture-01.c +++ b/tests/fbo/fbo-incomplete-texture-01.c @@ -33,7 +33,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-incomplete-texture-02.c b/tests/fbo/fbo-incomplete-texture-02.c index 65e7fea19..08c5c684f 100644 --- a/tests/fbo/fbo-incomplete-texture-02.c +++ b/tests/fbo/fbo-incomplete-texture-02.c @@ -33,7 +33,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-incomplete-texture-03.c b/tests/fbo/fbo-incomplete-texture-03.c index 35026072e..136e07a23 100644 --- a/tests/fbo/fbo-incomplete-texture-03.c +++ b/tests/fbo/fbo-incomplete-texture-03.c @@ -32,7 +32,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-incomplete-texture-04.c b/tests/fbo/fbo-incomplete-texture-04.c index c3521ee11..61597f764 100644 --- a/tests/fbo/fbo-incomplete-texture-04.c +++ b/tests/fbo/fbo-incomplete-texture-04.c @@ -33,7 +33,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-incomplete.cpp b/tests/fbo/fbo-incomplete.cpp index 498a4a4ae..e48ec4b31 100644 --- a/tests/fbo/fbo-incomplete.cpp +++ b/tests/fbo/fbo-incomplete.cpp @@ -26,7 +26,7 @@ * Collection of negative framebuffer completeness tests. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-integer.c b/tests/fbo/fbo-integer.c index 63ed52ac8..044d411f6 100644 --- a/tests/fbo/fbo-integer.c +++ b/tests/fbo/fbo-integer.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/fbo/fbo-luminance-alpha.c b/tests/fbo/fbo-luminance-alpha.c index 5de8eb5a9..8ece65348 100644 --- a/tests/fbo/fbo-luminance-alpha.c +++ b/tests/fbo/fbo-luminance-alpha.c @@ -33,7 +33,7 @@ * GL_ARB_framebuffer_object. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-maxsize.c b/tests/fbo/fbo-maxsize.c index 48cf9456e..02ce0940d 100644 --- a/tests/fbo/fbo-maxsize.c +++ b/tests/fbo/fbo-maxsize.c @@ -27,7 +27,7 @@ * Tests that rendering to a texture of maximum size works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-mipmap-copypix.c b/tests/fbo/fbo-mipmap-copypix.c index 143606bdf..152e56f9e 100644 --- a/tests/fbo/fbo-mipmap-copypix.c +++ b/tests/fbo/fbo-mipmap-copypix.c @@ -31,7 +31,7 @@ * May 25, 2011 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-mrt-alphatest.c b/tests/fbo/fbo-mrt-alphatest.c index fb78df185..d725cb68f 100644 --- a/tests/fbo/fbo-mrt-alphatest.c +++ b/tests/fbo/fbo-mrt-alphatest.c @@ -34,7 +34,7 @@ * significant edge case for the i965 driver. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-nodepth-test.c b/tests/fbo/fbo-nodepth-test.c index 2f325919a..9e86b170b 100644 --- a/tests/fbo/fbo-nodepth-test.c +++ b/tests/fbo/fbo-nodepth-test.c @@ -31,7 +31,7 @@ * succeeds regardless of depth func. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-nostencil-test.c b/tests/fbo/fbo-nostencil-test.c index 598d78773..0ca76ba7e 100644 --- a/tests/fbo/fbo-nostencil-test.c +++ b/tests/fbo/fbo-nostencil-test.c @@ -31,7 +31,7 @@ * succeeds regardless of stencil funcs. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-pbo-readpixels-small.c b/tests/fbo/fbo-pbo-readpixels-small.c index 1f4744344..919c9fe5f 100644 --- a/tests/fbo/fbo-pbo-readpixels-small.c +++ b/tests/fbo/fbo-pbo-readpixels-small.c @@ -34,7 +34,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=25921 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 8 #define BUF_HEIGHT 8 diff --git a/tests/fbo/fbo-readdrawpix.c b/tests/fbo/fbo-readdrawpix.c index 03cfd5d42..7d2e8f8c6 100644 --- a/tests/fbo/fbo-readdrawpix.c +++ b/tests/fbo/fbo-readdrawpix.c @@ -31,7 +31,7 @@ * See also fbo-blit.c and fbo-copypix.c */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-readpixels-depth-formats.c b/tests/fbo/fbo-readpixels-depth-formats.c index d798f8692..8b3fdac47 100644 --- a/tests/fbo/fbo-readpixels-depth-formats.c +++ b/tests/fbo/fbo-readpixels-depth-formats.c @@ -28,7 +28,7 @@ * combinations. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 15 #define BUF_HEIGHT 15 diff --git a/tests/fbo/fbo-readpixels.c b/tests/fbo/fbo-readpixels.c index eb5c97189..d70fed041 100644 --- a/tests/fbo/fbo-readpixels.c +++ b/tests/fbo/fbo-readpixels.c @@ -31,7 +31,7 @@ * glReadPixels() versus glClear and immediate mode rendering. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 #define BUF_HEIGHT 32 diff --git a/tests/fbo/fbo-rg.c b/tests/fbo/fbo-rg.c index 0bcc198e6..58a2de026 100644 --- a/tests/fbo/fbo-rg.c +++ b/tests/fbo/fbo-rg.c @@ -35,7 +35,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define EPSILON (1.0 / 255.0) diff --git a/tests/fbo/fbo-scissor-bitmap.c b/tests/fbo/fbo-scissor-bitmap.c index b6e2e9e9a..0ed5f9ad3 100644 --- a/tests/fbo/fbo-scissor-bitmap.c +++ b/tests/fbo/fbo-scissor-bitmap.c @@ -32,7 +32,7 @@ * This is a mirror of scissor-bitmap.c to windows. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-scissor-blit.c b/tests/fbo/fbo-scissor-blit.c index 0a792ebfd..3251f7f65 100644 --- a/tests/fbo/fbo-scissor-blit.c +++ b/tests/fbo/fbo-scissor-blit.c @@ -36,7 +36,7 @@ * (without scissoring it) so that failures can be easily diagnosed. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static const int width = 128, height = 128; diff --git a/tests/fbo/fbo-srgb-blit.c b/tests/fbo/fbo-srgb-blit.c index 6ffa4c99b..8c7eff441 100644 --- a/tests/fbo/fbo-srgb-blit.c +++ b/tests/fbo/fbo-srgb-blit.c @@ -28,7 +28,7 @@ * linear color space. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-srgb.c b/tests/fbo/fbo-srgb.c index 031cfe9e0..a379d9df4 100644 --- a/tests/fbo/fbo-srgb.c +++ b/tests/fbo/fbo-srgb.c @@ -33,7 +33,7 @@ * To get SRGB blending EXT_framebuffer_sRGB is required. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-stencil.c b/tests/fbo/fbo-stencil.c index 6530ae700..050d76115 100644 --- a/tests/fbo/fbo-stencil.c +++ b/tests/fbo/fbo-stencil.c @@ -28,7 +28,7 @@ * with stencil buffers. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_SIZE 123 diff --git a/tests/fbo/fbo-storage-completeness.c b/tests/fbo/fbo-storage-completeness.c index 0b4f52b64..87f15aadf 100644 --- a/tests/fbo/fbo-storage-completeness.c +++ b/tests/fbo/fbo-storage-completeness.c @@ -31,7 +31,7 @@ * Marek Olšák */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-storage-formats.c b/tests/fbo/fbo-storage-formats.c index 3b6b70922..af6a34250 100644 --- a/tests/fbo/fbo-storage-formats.c +++ b/tests/fbo/fbo-storage-formats.c @@ -30,7 +30,7 @@ * Brian Paul */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-sys-blit.c b/tests/fbo/fbo-sys-blit.c index c4f074249..26783cd8d 100644 --- a/tests/fbo/fbo-sys-blit.c +++ b/tests/fbo/fbo-sys-blit.c @@ -27,7 +27,7 @@ * Test FBO blits involving the window-system-provided framebuffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-sys-sub-blit.c b/tests/fbo/fbo-sys-sub-blit.c index 624876506..183036815 100644 --- a/tests/fbo/fbo-sys-sub-blit.c +++ b/tests/fbo/fbo-sys-sub-blit.c @@ -28,7 +28,7 @@ * Test FBO blits involving a subset of the window-system buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/fbo/fbo-tex-rgbx.c b/tests/fbo/fbo-tex-rgbx.c index 61b8a80cd..feb209562 100644 --- a/tests/fbo/fbo-tex-rgbx.c +++ b/tests/fbo/fbo-tex-rgbx.c @@ -33,7 +33,7 @@ * sample from it. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_SIZE 256 diff --git a/tests/fbo/fbo-viewport.c b/tests/fbo/fbo-viewport.c index 89ee71e06..d685f3690 100644 --- a/tests/fbo/fbo-viewport.c +++ b/tests/fbo/fbo-viewport.c @@ -29,7 +29,7 @@ * same thing into an FBO. Compare the images. They should be the same. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/array-stride.c b/tests/general/array-stride.c index 332bf16c8..1e155364f 100644 --- a/tests/general/array-stride.c +++ b/tests/general/array-stride.c @@ -27,7 +27,7 @@ * June 14, 2011 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/attribs.c b/tests/general/attribs.c index 3185c2416..3f021425b 100644 --- a/tests/general/attribs.c +++ b/tests/general/attribs.c @@ -30,7 +30,7 @@ * tested here. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c index ddb140cfe..e9589f39b 100644 --- a/tests/general/bgra-sec-color-pointer.c +++ b/tests/general/bgra-sec-color-pointer.c @@ -30,7 +30,7 @@ * with alpha blending. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c index fc39cede0..96fee867d 100644 --- a/tests/general/bgra-vert-attrib-pointer.c +++ b/tests/general/bgra-vert-attrib-pointer.c @@ -29,7 +29,7 @@ * two quads are drawn without blending and two are drawn with alpha blending. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c index ca5c0eaa2..c9da53440 100644 --- a/tests/general/blendminmax.c +++ b/tests/general/blendminmax.c @@ -32,7 +32,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/blendsquare.c b/tests/general/blendsquare.c index a7ca3679e..78d427163 100644 --- a/tests/general/blendsquare.c +++ b/tests/general/blendsquare.c @@ -32,7 +32,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/clear-accum.c b/tests/general/clear-accum.c index eddfdd362..a8ac6bd35 100644 --- a/tests/general/clear-accum.c +++ b/tests/general/clear-accum.c @@ -30,7 +30,7 @@ * Tests that clear accum buffer */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c index 552df7218..ab230e446 100644 --- a/tests/general/clear-varray-2.0.c +++ b/tests/general/clear-varray-2.0.c @@ -32,7 +32,7 @@ * fd.o bug #21638 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/clipflat.c b/tests/general/clipflat.c index 03a069c42..91e410e3a 100644 --- a/tests/general/clipflat.c +++ b/tests/general/clipflat.c @@ -39,7 +39,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/general/copy-pixels.c b/tests/general/copy-pixels.c index 1b3c52810..aff369db2 100644 --- a/tests/general/copy-pixels.c +++ b/tests/general/copy-pixels.c @@ -29,7 +29,7 @@ * Author: Anuj Phogat */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define IMAGE_WIDTH 16 #define IMAGE_HEIGHT 16 diff --git a/tests/general/copypixels-draw-sync.c b/tests/general/copypixels-draw-sync.c index b31dc23bc..50c353d3d 100644 --- a/tests/general/copypixels-draw-sync.c +++ b/tests/general/copypixels-draw-sync.c @@ -29,7 +29,7 @@ * syncing on the i965 driver. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/copypixels-sync.c b/tests/general/copypixels-sync.c index d36256902..d3441411b 100644 --- a/tests/general/copypixels-sync.c +++ b/tests/general/copypixels-sync.c @@ -28,7 +28,7 @@ * blit ring IRQ handling on the i965 driver. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/degenerate-prims.c b/tests/general/degenerate-prims.c index 53e8d5f26..749ee406c 100644 --- a/tests/general/degenerate-prims.c +++ b/tests/general/degenerate-prims.c @@ -33,7 +33,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/general/depth-clamp-range.c b/tests/general/depth-clamp-range.c index b3d3e2f34..dd9300022 100644 --- a/tests/general/depth-clamp-range.c +++ b/tests/general/depth-clamp-range.c @@ -30,7 +30,7 @@ * and properly uses the min/max selection. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/depth_clamp.c b/tests/general/depth_clamp.c index 782ee13a5..27b76960e 100644 --- a/tests/general/depth_clamp.c +++ b/tests/general/depth_clamp.c @@ -34,7 +34,7 @@ * the same operations against the far plane. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c index 20d1bd881..5441cadbd 100644 --- a/tests/general/depthfunc.c +++ b/tests/general/depthfunc.c @@ -30,7 +30,7 @@ * Tests that glDepthFunc()'s various modes all work correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/depthrange-clear.c b/tests/general/depthrange-clear.c index e0c7d3485..e382401e8 100644 --- a/tests/general/depthrange-clear.c +++ b/tests/general/depthrange-clear.c @@ -31,7 +31,7 @@ * Caught a regression in the intel driver with the metaops clear code. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/dlist-clear.c b/tests/general/dlist-clear.c index 6e76ee69b..4fd45c33d 100644 --- a/tests/general/dlist-clear.c +++ b/tests/general/dlist-clear.c @@ -32,7 +32,7 @@ * with the new metaops clear code. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/dlist-color-material.c b/tests/general/dlist-color-material.c index 005442c1f..3c323750e 100644 --- a/tests/general/dlist-color-material.c +++ b/tests/general/dlist-color-material.c @@ -33,7 +33,7 @@ #include <assert.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c index 3d09de257..51de0a3ad 100644 --- a/tests/general/dlist-fdo3129-01.c +++ b/tests/general/dlist-fdo3129-01.c @@ -28,7 +28,7 @@ * This test is based on a test case posted to fdo bug #3129 by David Reveman. * Once upon a time, this triggered an assertion failure in Mesa. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c index 2ef3ebf86..fff8eccaa 100644 --- a/tests/general/dlist-fdo3129-02.c +++ b/tests/general/dlist-fdo3129-02.c @@ -28,7 +28,7 @@ * This test is based on a test case posted to fdo bug #3129 by Nicolai Hähnle. * Once upon a time, this triggered an assertion failure in Mesa. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/dlist-fdo31590.c b/tests/general/dlist-fdo31590.c index 8cda8bd2a..59f062a00 100644 --- a/tests/general/dlist-fdo31590.c +++ b/tests/general/dlist-fdo31590.c @@ -33,7 +33,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static const char *TestName = "dlist-fdo31590"; diff --git a/tests/general/draw-arrays-colormaterial.c b/tests/general/draw-arrays-colormaterial.c index a1c3dc297..e18401127 100644 --- a/tests/general/draw-arrays-colormaterial.c +++ b/tests/general/draw-arrays-colormaterial.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/general/draw-batch.c b/tests/general/draw-batch.c index a0c0eead0..4148bfafe 100644 --- a/tests/general/draw-batch.c +++ b/tests/general/draw-batch.c @@ -22,7 +22,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/draw-copypixels-sync.c b/tests/general/draw-copypixels-sync.c index b76af72c6..5a76fbea0 100644 --- a/tests/general/draw-copypixels-sync.c +++ b/tests/general/draw-copypixels-sync.c @@ -28,7 +28,7 @@ * stresses render to blitter syncing on the i965 driver. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c index 0e4537824..6611b18c1 100644 --- a/tests/general/draw-elements-vs-inputs.c +++ b/tests/general/draw-elements-vs-inputs.c @@ -37,7 +37,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c index d31d0dc32..0f712c70c 100644 --- a/tests/general/draw-elements.c +++ b/tests/general/draw-elements.c @@ -29,7 +29,7 @@ * elements formats. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/draw-pixel-with-texture.c b/tests/general/draw-pixel-with-texture.c index b28dc591a..c03131ebf 100644 --- a/tests/general/draw-pixel-with-texture.c +++ b/tests/general/draw-pixel-with-texture.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/draw-pixels.c b/tests/general/draw-pixels.c index c1a2d38dc..46bacfaa6 100644 --- a/tests/general/draw-pixels.c +++ b/tests/general/draw-pixels.c @@ -30,7 +30,7 @@ * author: Anuj Phogat */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /* Data conversions as used in mesa */ /** Convert GLubyte in [0,255] to GLfloat in [0.0,1.0] */ diff --git a/tests/general/draw-sync.c b/tests/general/draw-sync.c index 641e6223f..1178586ef 100644 --- a/tests/general/draw-sync.c +++ b/tests/general/draw-sync.c @@ -28,7 +28,7 @@ * ring IRQ handling on the i965 driver. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c index 176a07611..37f1dc5a2 100644 --- a/tests/general/draw-vertices-half-float.c +++ b/tests/general/draw-vertices-half-float.c @@ -29,7 +29,7 @@ * This one is for half float vertices. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c index a7933b0b7..cd48816c7 100644 --- a/tests/general/draw-vertices.c +++ b/tests/general/draw-vertices.c @@ -29,7 +29,7 @@ * but tests for various vertex formats are provided too. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/drawpix-z.c b/tests/general/drawpix-z.c index 0d789eae6..1cb01f559 100644 --- a/tests/general/drawpix-z.c +++ b/tests/general/drawpix-z.c @@ -34,7 +34,7 @@ * visible. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/early-z.c b/tests/general/early-z.c index 9f4b611cf..ec6790073 100644 --- a/tests/general/early-z.c +++ b/tests/general/early-z.c @@ -27,7 +27,7 @@ * Test for bugs with early depth testing and early depth update. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c index 69b36efc0..3e396ba98 100644 --- a/tests/general/fog-modes.c +++ b/tests/general/fog-modes.c @@ -26,7 +26,7 @@ * Tests that the three fog modes work with fog enabled using the depth value. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #if defined(_WIN32) #undef near diff --git a/tests/general/fragment-center.c b/tests/general/fragment-center.c index 1b15242ce..841abd118 100644 --- a/tests/general/fragment-center.c +++ b/tests/general/fragment-center.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/general/framebuffer-srgb.c b/tests/general/framebuffer-srgb.c index 3cf50a622..acae0f000 100644 --- a/tests/general/framebuffer-srgb.c +++ b/tests/general/framebuffer-srgb.c @@ -32,7 +32,7 @@ * the API acts correctly in that case. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/getactiveattrib.c b/tests/general/getactiveattrib.c index a1075b1d6..81c665743 100644 --- a/tests/general/getactiveattrib.c +++ b/tests/general/getactiveattrib.c @@ -29,7 +29,7 @@ * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/geterror-inside-begin.c b/tests/general/geterror-inside-begin.c index f51819d5a..1d59a2336 100644 --- a/tests/general/geterror-inside-begin.c +++ b/tests/general/geterror-inside-begin.c @@ -33,7 +33,7 @@ * @author Vinson Lee <vlee@vmware.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/geterror-invalid-enum.c b/tests/general/geterror-invalid-enum.c index 1f3aa184e..143c7c420 100644 --- a/tests/general/geterror-invalid-enum.c +++ b/tests/general/geterror-invalid-enum.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/gl30basic.c b/tests/general/gl30basic.c index a842a96f5..2207787bb 100644 --- a/tests/general/gl30basic.c +++ b/tests/general/gl30basic.c @@ -31,7 +31,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/glinfo.c b/tests/general/glinfo.c index b60ae6d4d..a2bc5fd5e 100644 --- a/tests/general/glinfo.c +++ b/tests/general/glinfo.c @@ -36,7 +36,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/hiz.c b/tests/general/hiz.c index 10fa53ce2..6bdeeff98 100644 --- a/tests/general/hiz.c +++ b/tests/general/hiz.c @@ -30,7 +30,7 @@ * Tests that two overlapping triangles are rendered correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/infinite-spot-light.c b/tests/general/infinite-spot-light.c index a2b27577e..5b475e625 100644 --- a/tests/general/infinite-spot-light.c +++ b/tests/general/infinite-spot-light.c @@ -39,7 +39,7 @@ * infinite light is met. This is somehow not permitted by glSpec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c index 965760093..78a22d634 100644 --- a/tests/general/isbufferobj.c +++ b/tests/general/isbufferobj.c @@ -32,7 +32,7 @@ * Test glIsBuffer() */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/line-aa-width.c b/tests/general/line-aa-width.c index dd35a677a..c0fd7c10a 100644 --- a/tests/general/line-aa-width.c +++ b/tests/general/line-aa-width.c @@ -36,7 +36,7 @@ * ugly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/line-flat-clip-color.c b/tests/general/line-flat-clip-color.c index eb771dc0f..e290a5dc0 100644 --- a/tests/general/line-flat-clip-color.c +++ b/tests/general/line-flat-clip-color.c @@ -29,7 +29,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/general/linestipple.c b/tests/general/linestipple.c index 4e81585cd..ba0924e63 100644 --- a/tests/general/linestipple.c +++ b/tests/general/linestipple.c @@ -26,7 +26,7 @@ * Test basic line stippling functionality. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/longprim.c b/tests/general/longprim.c index b4344f2fb..57bfcbe3c 100644 --- a/tests/general/longprim.c +++ b/tests/general/longprim.c @@ -28,7 +28,7 @@ * Brian Paul */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/masked-clear.c b/tests/general/masked-clear.c index 21fe944f1..e205fa961 100644 --- a/tests/general/masked-clear.c +++ b/tests/general/masked-clear.c @@ -31,7 +31,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/general/object_purgeable-api-pbo.c b/tests/general/object_purgeable-api-pbo.c index 86ce3f563..0a44203ca 100644 --- a/tests/general/object_purgeable-api-pbo.c +++ b/tests/general/object_purgeable-api-pbo.c @@ -29,7 +29,7 @@ * Simple test of the API for GL_APPLE_object_purgeable with GL_ARB_pixel_buffer_object. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "object_purgeable.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/object_purgeable-api-texture.c b/tests/general/object_purgeable-api-texture.c index 4edeff388..280378707 100644 --- a/tests/general/object_purgeable-api-texture.c +++ b/tests/general/object_purgeable-api-texture.c @@ -29,7 +29,7 @@ * Simple test of the API for GL_APPLE_object_purgeable with texture object. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "object_purgeable.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/object_purgeable-api-vbo.c b/tests/general/object_purgeable-api-vbo.c index 6d6b6759a..fcb5d4d98 100644 --- a/tests/general/object_purgeable-api-vbo.c +++ b/tests/general/object_purgeable-api-vbo.c @@ -29,7 +29,7 @@ * Simple test of the API for GL_APPLE_object_purgeable with GL_ARB_vertex_buffer_object. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "object_purgeable.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/object_purgeable.c b/tests/general/object_purgeable.c index 8783f8d16..06ba50ce9 100644 --- a/tests/general/object_purgeable.c +++ b/tests/general/object_purgeable.c @@ -25,7 +25,7 @@ * Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "object_purgeable.h" #define FAIL_ON_ERROR(string) \ diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c index a755facc6..f315387dd 100644 --- a/tests/general/occlusion-query-discard.c +++ b/tests/general/occlusion-query-discard.c @@ -31,7 +31,7 @@ * Simple test for GL_ARB_occlusion_query with a discard statement in GLSL. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/oes-read-format.c b/tests/general/oes-read-format.c index 459fe407a..cfe6e27c1 100644 --- a/tests/general/oes-read-format.c +++ b/tests/general/oes-read-format.c @@ -31,7 +31,7 @@ * for ReadPixels. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/pbo-drawpixels.c b/tests/general/pbo-drawpixels.c index 9efaf09ef..90bbaf1e4 100644 --- a/tests/general/pbo-drawpixels.c +++ b/tests/general/pbo-drawpixels.c @@ -31,7 +31,7 @@ * Caught a bug with the Intel driver with the metaops drawpixels code. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/pbo-read-argb8888.c b/tests/general/pbo-read-argb8888.c index 123b05fb1..99b4b3b09 100644 --- a/tests/general/pbo-read-argb8888.c +++ b/tests/general/pbo-read-argb8888.c @@ -32,7 +32,7 @@ * This test should hit the blit-based readpixels in the intel driver. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/pbo-readpixels-small.c b/tests/general/pbo-readpixels-small.c index 900a92917..9fec2a078 100644 --- a/tests/general/pbo-readpixels-small.c +++ b/tests/general/pbo-readpixels-small.c @@ -36,7 +36,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=25921 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/pbo-teximage-tiling-2.c b/tests/general/pbo-teximage-tiling-2.c index f3e0c8341..b04e1d9c7 100644 --- a/tests/general/pbo-teximage-tiling-2.c +++ b/tests/general/pbo-teximage-tiling-2.c @@ -32,7 +32,7 @@ * be on Intel. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/pbo-teximage-tiling.c b/tests/general/pbo-teximage-tiling.c index b9bef0375..a95f25b45 100644 --- a/tests/general/pbo-teximage-tiling.c +++ b/tests/general/pbo-teximage-tiling.c @@ -32,7 +32,7 @@ * be on Intel. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/pbo-teximage.c b/tests/general/pbo-teximage.c index ebd9d9ebb..73394db31 100644 --- a/tests/general/pbo-teximage.c +++ b/tests/general/pbo-teximage.c @@ -30,7 +30,7 @@ * Tests that using a PBO as the unpack buffer for glTexImage works correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/point-line-no-cull.c b/tests/general/point-line-no-cull.c index 5a13a5571..511e38767 100644 --- a/tests/general/point-line-no-cull.c +++ b/tests/general/point-line-no-cull.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/general/polygon-mode-offset.c b/tests/general/polygon-mode-offset.c index 3832df201..df53d0513 100644 --- a/tests/general/polygon-mode-offset.c +++ b/tests/general/polygon-mode-offset.c @@ -31,7 +31,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/polygon-mode.c b/tests/general/polygon-mode.c index dffb10e01..15a006498 100644 --- a/tests/general/polygon-mode.c +++ b/tests/general/polygon-mode.c @@ -28,7 +28,7 @@ * April 2011 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/polygon-offset.c b/tests/general/polygon-offset.c index da3a0697d..95d4b0dde 100644 --- a/tests/general/polygon-offset.c +++ b/tests/general/polygon-offset.c @@ -24,7 +24,7 @@ * Keith Packard <keithp@keithp.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/pos-array.c b/tests/general/pos-array.c index ebc2eaf44..a3776a311 100644 --- a/tests/general/pos-array.c +++ b/tests/general/pos-array.c @@ -30,7 +30,7 @@ * May 2011 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/primitive-restart-draw-mode.c b/tests/general/primitive-restart-draw-mode.c index 722a44088..cca89e385 100644 --- a/tests/general/primitive-restart-draw-mode.c +++ b/tests/general/primitive-restart-draw-mode.c @@ -53,7 +53,7 @@ * GL_POINTS. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define NUM_VERTICES 8 diff --git a/tests/general/primitive-restart.c b/tests/general/primitive-restart.c index 0674c1145..ce3db8f02 100644 --- a/tests/general/primitive-restart.c +++ b/tests/general/primitive-restart.c @@ -31,7 +31,7 @@ * Brian Paul */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/provoking-vertex.c b/tests/general/provoking-vertex.c index 6227f2d7b..523b6b469 100644 --- a/tests/general/provoking-vertex.c +++ b/tests/general/provoking-vertex.c @@ -31,7 +31,7 @@ * Second tri using GL_LAST_VERTEX_CONVENTION_EXT. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/push-pop-texture-state.c b/tests/general/push-pop-texture-state.c index 360b71c56..6ff089374 100644 --- a/tests/general/push-pop-texture-state.c +++ b/tests/general/push-pop-texture-state.c @@ -5,7 +5,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=9833 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/quad-invariance.c b/tests/general/quad-invariance.c index ce7e48cbb..b5741d043 100644 --- a/tests/general/quad-invariance.c +++ b/tests/general/quad-invariance.c @@ -36,7 +36,7 @@ * test is only a warning. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/read-front.c b/tests/general/read-front.c index 5208d0442..04d8337cc 100644 --- a/tests/general/read-front.c +++ b/tests/general/read-front.c @@ -35,7 +35,7 @@ * used as a draw buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/readpix-z.c b/tests/general/readpix-z.c index 92179069c..eb523af5e 100644 --- a/tests/general/readpix-z.c +++ b/tests/general/readpix-z.c @@ -27,7 +27,7 @@ * June 2012 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c index 1453ced17..28ecfaf55 100644 --- a/tests/general/roundmode-getintegerv.c +++ b/tests/general/roundmode-getintegerv.c @@ -39,7 +39,7 @@ * coordinate." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <fenv.h> diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c index 0643647da..9284f4354 100644 --- a/tests/general/roundmode-pixelstore.c +++ b/tests/general/roundmode-pixelstore.c @@ -36,7 +36,7 @@ * the passed value is rounded to the nearest integer." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <fenv.h> diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c index d9978367e..0a8e7560c 100644 --- a/tests/general/scissor-bitmap.c +++ b/tests/general/scissor-bitmap.c @@ -31,7 +31,7 @@ * it's to window boundaries or glScissor. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/scissor-clear.c b/tests/general/scissor-clear.c index c94f86e45..5ec0495f7 100644 --- a/tests/general/scissor-clear.c +++ b/tests/general/scissor-clear.c @@ -30,7 +30,7 @@ * Tests that glScissor properly affects glClear(GL_COLOR_BUFFER_BIT)(). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/scissor-copypixels.c b/tests/general/scissor-copypixels.c index 206cfb3c5..1f43f42bc 100644 --- a/tests/general/scissor-copypixels.c +++ b/tests/general/scissor-copypixels.c @@ -30,7 +30,7 @@ * Tests that glScissor properly affects glCopyPixels(). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/scissor-depth-clear.c b/tests/general/scissor-depth-clear.c index dfb354f86..983227090 100644 --- a/tests/general/scissor-depth-clear.c +++ b/tests/general/scissor-depth-clear.c @@ -30,7 +30,7 @@ * Tests that glScissor properly affects glClear(GL_DEPTH_BUFFER_BIT). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/scissor-many.c b/tests/general/scissor-many.c index 24eb68d6d..17eb232b6 100644 --- a/tests/general/scissor-many.c +++ b/tests/general/scissor-many.c @@ -33,7 +33,7 @@ * driver, where each scissor state is in a separate BO. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/scissor-offscreen.c b/tests/general/scissor-offscreen.c index 6aae87100..c9b953b63 100644 --- a/tests/general/scissor-offscreen.c +++ b/tests/general/scissor-offscreen.c @@ -34,7 +34,7 @@ * Bug #27643 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/scissor-polygon.c b/tests/general/scissor-polygon.c index b252f7637..8ba3bbc87 100644 --- a/tests/general/scissor-polygon.c +++ b/tests/general/scissor-polygon.c @@ -29,7 +29,7 @@ * Feb 2013 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/general/scissor-stencil-clear.c b/tests/general/scissor-stencil-clear.c index 183e0befa..fb1230938 100644 --- a/tests/general/scissor-stencil-clear.c +++ b/tests/general/scissor-stencil-clear.c @@ -30,7 +30,7 @@ * Tests that glScissor properly affects glClear of the stencil buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/select.c b/tests/general/select.c index 288c3ff1b..879a1e9c1 100644 --- a/tests/general/select.c +++ b/tests/general/select.c @@ -31,7 +31,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/stencil-drawpixels.c b/tests/general/stencil-drawpixels.c index 0161fd276..e04ec9ec5 100644 --- a/tests/general/stencil-drawpixels.c +++ b/tests/general/stencil-drawpixels.c @@ -30,7 +30,7 @@ * Tests that glDrawPixels(GL_STENCIL) minimally works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/stencil-twoside.c b/tests/general/stencil-twoside.c index 00f9d016b..654b14b40 100644 --- a/tests/general/stencil-twoside.c +++ b/tests/general/stencil-twoside.c @@ -33,7 +33,7 @@ * final color. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static int use20syntax = 1; diff --git a/tests/general/stencil-wrap.c b/tests/general/stencil-wrap.c index b0f9c2d3f..dc0b1f1a8 100644 --- a/tests/general/stencil-wrap.c +++ b/tests/general/stencil-wrap.c @@ -32,7 +32,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/sync_api.c b/tests/general/sync_api.c index af08cdf34..09b4f0b5f 100644 --- a/tests/general/sync_api.c +++ b/tests/general/sync_api.c @@ -29,7 +29,7 @@ * Simple test of the API for GL_ARB_sync. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/texgen.c b/tests/general/texgen.c index cb3471003..0fb359aa0 100644 --- a/tests/general/texgen.c +++ b/tests/general/texgen.c @@ -26,7 +26,7 @@ * Test a number of basic TexGen functions. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/texunits.c b/tests/general/texunits.c index 8c9cf9560..d0cbbb3d1 100644 --- a/tests/general/texunits.c +++ b/tests/general/texunits.c @@ -28,7 +28,7 @@ * texture coord units, image units, combined units, etc. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/timer_query.c b/tests/general/timer_query.c index 44b6a6571..08c8d17b0 100644 --- a/tests/general/timer_query.c +++ b/tests/general/timer_query.c @@ -31,7 +31,7 @@ * Simple test for GL_EXT_timer_query. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/triangle-guardband-viewport.c b/tests/general/triangle-guardband-viewport.c index 1f921914e..9e99254f9 100644 --- a/tests/general/triangle-guardband-viewport.c +++ b/tests/general/triangle-guardband-viewport.c @@ -30,7 +30,7 @@ * not honor this requirement. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/triangle-rasterization-overdraw.cpp b/tests/general/triangle-rasterization-overdraw.cpp index c2e567328..39303030c 100644 --- a/tests/general/triangle-rasterization-overdraw.cpp +++ b/tests/general/triangle-rasterization-overdraw.cpp @@ -41,7 +41,7 @@ * around a circle that contains the entire window, thus going off screen. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "mersenne.hpp" #include <time.h> diff --git a/tests/general/triangle-rasterization.cpp b/tests/general/triangle-rasterization.cpp index bd20af2c9..0d99ef126 100644 --- a/tests/general/triangle-rasterization.cpp +++ b/tests/general/triangle-rasterization.cpp @@ -35,7 +35,7 @@ * 2. Randomised triangle drawing to attempt to test all possible triangles */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "mersenne.hpp" #include <time.h> diff --git a/tests/general/two-sided-lighting-separate-specular.c b/tests/general/two-sided-lighting-separate-specular.c index c95b5527e..8e1414e80 100644 --- a/tests/general/two-sided-lighting-separate-specular.c +++ b/tests/general/two-sided-lighting-separate-specular.c @@ -32,7 +32,7 @@ * Oct 2011 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/two-sided-lighting.c b/tests/general/two-sided-lighting.c index 0a4b3ca05..84fde3ab2 100644 --- a/tests/general/two-sided-lighting.c +++ b/tests/general/two-sided-lighting.c @@ -32,7 +32,7 @@ * Oct 2011 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c index d4748c062..df055ff45 100644 --- a/tests/general/user-clip.c +++ b/tests/general/user-clip.c @@ -27,7 +27,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BOX_SIZE 32 diff --git a/tests/general/vao-01.c b/tests/general/vao-01.c index 290a9bc35..e11199945 100644 --- a/tests/general/vao-01.c +++ b/tests/general/vao-01.c @@ -36,7 +36,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/vao-02.c b/tests/general/vao-02.c index 72b72693f..136be1d8d 100644 --- a/tests/general/vao-02.c +++ b/tests/general/vao-02.c @@ -36,7 +36,7 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/vao-element-array-buffer.c b/tests/general/vao-element-array-buffer.c index 6ab2ab69a..4b2106de1 100644 --- a/tests/general/vao-element-array-buffer.c +++ b/tests/general/vao-element-array-buffer.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/general/varray-disabled.c b/tests/general/varray-disabled.c index 152cdc4e1..44fb47171 100644 --- a/tests/general/varray-disabled.c +++ b/tests/general/varray-disabled.c @@ -34,7 +34,7 @@ * http://bugs.freedesktop.org/show_bug.cgi?id=19911 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/vbo-bufferdata.c b/tests/general/vbo-bufferdata.c index 33f63f2c8..d3a390616 100644 --- a/tests/general/vbo-bufferdata.c +++ b/tests/general/vbo-bufferdata.c @@ -25,7 +25,7 @@ * Marek Olšák <maraeo@gmail.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/vbo-map-remap.c b/tests/general/vbo-map-remap.c index c49909c6b..cb36d7277 100644 --- a/tests/general/vbo-map-remap.c +++ b/tests/general/vbo-map-remap.c @@ -24,7 +24,7 @@ * Ben Holmes <shranzel@hotmail.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/vbo-map-unsync.c b/tests/general/vbo-map-unsync.c index bda25a7dc..b2e9ca414 100644 --- a/tests/general/vbo-map-unsync.c +++ b/tests/general/vbo-map-unsync.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/general/vbo-subdata-sync.c b/tests/general/vbo-subdata-sync.c index 18f4cb61c..f99bf6cef 100644 --- a/tests/general/vbo-subdata-sync.c +++ b/tests/general/vbo-subdata-sync.c @@ -30,7 +30,7 @@ * Test for synchronizing behavior of glBufferSubDataARB, bug #23857. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/vbo-subdata-zero.c b/tests/general/vbo-subdata-zero.c index 329e6df92..5c395133a 100644 --- a/tests/general/vbo-subdata-zero.c +++ b/tests/general/vbo-subdata-zero.c @@ -24,7 +24,7 @@ * Ben Holmes <shranzel@hotmail.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/vs-point_size-zero.c b/tests/general/vs-point_size-zero.c index 0b47aedf5..99ba94abf 100644 --- a/tests/general/vs-point_size-zero.c +++ b/tests/general/vs-point_size-zero.c @@ -22,7 +22,7 @@ * SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/general/windowoverlap.c b/tests/general/windowoverlap.c index 6b08a75fd..19d1aaa1b 100644 --- a/tests/general/windowoverlap.c +++ b/tests/general/windowoverlap.c @@ -30,7 +30,7 @@ * This test was prompted by http://bugs.freedesktop.org/show_bug.cgi?id=16123 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static const int MainWidth = 128, MainHeight = 128; static const int SubX = 32, SubY = 32; diff --git a/tests/glean/glutils.cpp b/tests/glean/glutils.cpp index 12d9b8839..29b4cfe51 100644 --- a/tests/glean/glutils.cpp +++ b/tests/glean/glutils.cpp @@ -43,7 +43,7 @@ #if defined(__AGL__) # include <cstring> #endif -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" namespace GLEAN { diff --git a/tests/glslparsertest/glslparsertest.c b/tests/glslparsertest/glslparsertest.c index 3511de185..b969eff0f 100644 --- a/tests/glslparsertest/glslparsertest.c +++ b/tests/glslparsertest/glslparsertest.c @@ -33,7 +33,7 @@ #include <errno.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static unsigned parse_glsl_version_number(const char *str); static int process_options(int argc, char **argv); diff --git a/tests/glx/glx-buffer-age.c b/tests/glx/glx-buffer-age.c index 8008500a1..d20761694 100644 --- a/tests/glx/glx-buffer-age.c +++ b/tests/glx/glx-buffer-age.c @@ -36,7 +36,7 @@ * Test that GLX_EXT_buffer_age works as advertised */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #ifndef GLX_BACK_BUFFER_AGE_EXT diff --git a/tests/glx/glx-close-display.c b/tests/glx/glx-close-display.c index 478987223..7a2c71ff1 100644 --- a/tests/glx/glx-close-display.c +++ b/tests/glx/glx-close-display.c @@ -31,7 +31,7 @@ * Test that calling XCloseDisplay after using GLX context works correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" /** diff --git a/tests/glx/glx-copy-sub-buffer.c b/tests/glx/glx-copy-sub-buffer.c index 5bf28f268..2acf22bac 100644 --- a/tests/glx/glx-copy-sub-buffer.c +++ b/tests/glx/glx-copy-sub-buffer.c @@ -33,7 +33,7 @@ * Test that GLX_MESA_copy_sub_buffer works as advertised */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 100, piglit_height = 100; diff --git a/tests/glx/glx-destroycontext-1.c b/tests/glx/glx-destroycontext-1.c index fc27b6e59..638d75675 100644 --- a/tests/glx/glx-destroycontext-1.c +++ b/tests/glx/glx-destroycontext-1.c @@ -31,7 +31,7 @@ * current thread works correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-destroycontext-2.c b/tests/glx/glx-destroycontext-2.c index e4c6d372a..d12ac0e37 100644 --- a/tests/glx/glx-destroycontext-2.c +++ b/tests/glx/glx-destroycontext-2.c @@ -31,7 +31,7 @@ * current thread works correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-dont-care-mask.c b/tests/glx/glx-dont-care-mask.c index dace55875..642dc9cbc 100644 --- a/tests/glx/glx-dont-care-mask.c +++ b/tests/glx/glx-dont-care-mask.c @@ -37,7 +37,7 @@ * \sa https://bugs.freedesktop.org/show_bug.cgi?id=47478 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 10; diff --git a/tests/glx/glx-fbconfig-compliance.c b/tests/glx/glx-fbconfig-compliance.c index 0cd2183cc..5a19881ba 100644 --- a/tests/glx/glx-fbconfig-compliance.c +++ b/tests/glx/glx-fbconfig-compliance.c @@ -27,7 +27,7 @@ * minimum requirements specified by GLX 1.4 section 3.3.3 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" static PFNGLXGETFBCONFIGSPROC GetFBConfigs = NULL; diff --git a/tests/glx/glx-fbconfig-sanity.c b/tests/glx/glx-fbconfig-sanity.c index 9e570aa5d..9af89bf92 100644 --- a/tests/glx/glx-fbconfig-sanity.c +++ b/tests/glx/glx-fbconfig-sanity.c @@ -27,7 +27,7 @@ * This reproduces X.org bugzilla #34265, among much else. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 10; diff --git a/tests/glx/glx-fbo-binding.c b/tests/glx/glx-fbo-binding.c index bfdc4dd0a..c454cbf72 100644 --- a/tests/glx/glx-fbo-binding.c +++ b/tests/glx/glx-fbo-binding.c @@ -27,7 +27,7 @@ * June 15, 2011 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-make-current-bad-context.c b/tests/glx/glx-make-current-bad-context.c index 0064251c2..55b3c9849 100644 --- a/tests/glx/glx-make-current-bad-context.c +++ b/tests/glx/glx-make-current-bad-context.c @@ -27,7 +27,7 @@ * GLXBadContext. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-make-current.c b/tests/glx/glx-make-current.c index dde99b4f5..fd284ba70 100644 --- a/tests/glx/glx-make-current.c +++ b/tests/glx/glx-make-current.c @@ -32,7 +32,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-make-glxdrawable-current.c b/tests/glx/glx-make-glxdrawable-current.c index fc339be7f..6f3c14a04 100644 --- a/tests/glx/glx-make-glxdrawable-current.c +++ b/tests/glx/glx-make-glxdrawable-current.c @@ -33,7 +33,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=30457 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-multi-context-ib-1.c b/tests/glx/glx-multi-context-ib-1.c index 2b3c00ea4..5b6a59ab3 100644 --- a/tests/glx/glx-multi-context-ib-1.c +++ b/tests/glx/glx-multi-context-ib-1.c @@ -31,7 +31,7 @@ */ #include <unistd.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-multithread-makecurrent-1.c b/tests/glx/glx-multithread-makecurrent-1.c index acfc27916..b60fceea1 100644 --- a/tests/glx/glx-multithread-makecurrent-1.c +++ b/tests/glx/glx-multithread-makecurrent-1.c @@ -29,7 +29,7 @@ */ #include <unistd.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "pthread.h" diff --git a/tests/glx/glx-multithread-makecurrent-2.c b/tests/glx/glx-multithread-makecurrent-2.c index 60da0aee4..714ade1d9 100644 --- a/tests/glx/glx-multithread-makecurrent-2.c +++ b/tests/glx/glx-multithread-makecurrent-2.c @@ -30,7 +30,7 @@ */ #include <unistd.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "pthread.h" diff --git a/tests/glx/glx-multithread-makecurrent-3.c b/tests/glx/glx-multithread-makecurrent-3.c index 12ffe8602..413754dfc 100644 --- a/tests/glx/glx-multithread-makecurrent-3.c +++ b/tests/glx/glx-multithread-makecurrent-3.c @@ -30,7 +30,7 @@ */ #include <unistd.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "pthread.h" diff --git a/tests/glx/glx-multithread-makecurrent-4.c b/tests/glx/glx-multithread-makecurrent-4.c index c25114779..f8f4da03e 100644 --- a/tests/glx/glx-multithread-makecurrent-4.c +++ b/tests/glx/glx-multithread-makecurrent-4.c @@ -29,7 +29,7 @@ */ #include <unistd.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "pthread.h" diff --git a/tests/glx/glx-multithread-shader-compile.c b/tests/glx/glx-multithread-shader-compile.c index 82042d586..f24e1761f 100644 --- a/tests/glx/glx-multithread-shader-compile.c +++ b/tests/glx/glx-multithread-shader-compile.c @@ -29,7 +29,7 @@ * Exercises a race conditon with the r600 llvm compiler. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "pthread.h" diff --git a/tests/glx/glx-multithread-texture.c b/tests/glx/glx-multithread-texture.c index 59dc73031..94ca1bc2e 100644 --- a/tests/glx/glx-multithread-texture.c +++ b/tests/glx/glx-multithread-texture.c @@ -30,7 +30,7 @@ #include <unistd.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "pthread.h" diff --git a/tests/glx/glx-multithread.c b/tests/glx/glx-multithread.c index f88f8da9b..92dbe2abc 100644 --- a/tests/glx/glx-multithread.c +++ b/tests/glx/glx-multithread.c @@ -31,7 +31,7 @@ * to the same GLX window works correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "pthread.h" diff --git a/tests/glx/glx-pixmap-crosscheck.c b/tests/glx/glx-pixmap-crosscheck.c index 0b3f1bdca..40c10743c 100644 --- a/tests/glx/glx-pixmap-crosscheck.c +++ b/tests/glx/glx-pixmap-crosscheck.c @@ -33,7 +33,7 @@ * what to expect if you aren't that fastidious. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-pixmap-life.c b/tests/glx/glx-pixmap-life.c index bf1ce2a64..da2d7b993 100644 --- a/tests/glx/glx-pixmap-life.c +++ b/tests/glx/glx-pixmap-life.c @@ -31,7 +31,7 @@ * either order, without error. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-pixmap-multi.c b/tests/glx/glx-pixmap-multi.c index a0dddfeee..88a2184e2 100644 --- a/tests/glx/glx-pixmap-multi.c +++ b/tests/glx/glx-pixmap-multi.c @@ -31,7 +31,7 @@ * attached to the same X pixmap, so one must assume it's allowed. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-pixmap13-life.c b/tests/glx/glx-pixmap13-life.c index be45f8166..ae9a0d2d9 100644 --- a/tests/glx/glx-pixmap13-life.c +++ b/tests/glx/glx-pixmap13-life.c @@ -32,7 +32,7 @@ * fbconfigs. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-query-drawable.c b/tests/glx/glx-query-drawable.c index 49ac2276f..9a83395ec 100644 --- a/tests/glx/glx-query-drawable.c +++ b/tests/glx/glx-query-drawable.c @@ -30,7 +30,7 @@ * For usage information, see usage_error(); */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 137; diff --git a/tests/glx/glx-shader-sharing.c b/tests/glx/glx-shader-sharing.c index 1b180aed3..1a022c09e 100644 --- a/tests/glx/glx-shader-sharing.c +++ b/tests/glx/glx-shader-sharing.c @@ -29,7 +29,7 @@ * draw with second context. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-string-sanity.c b/tests/glx/glx-string-sanity.c index 1711d23da..3a86f11b8 100644 --- a/tests/glx/glx-string-sanity.c +++ b/tests/glx/glx-string-sanity.c @@ -29,7 +29,7 @@ */ #include <stdbool.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" static const char * diff --git a/tests/glx/glx-swap-event.c b/tests/glx/glx-swap-event.c index baae6f32d..74a16cc5c 100644 --- a/tests/glx/glx-swap-event.c +++ b/tests/glx/glx-swap-event.c @@ -29,7 +29,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "GL/glx.h" #include <sys/time.h> diff --git a/tests/glx/glx-swap-exchange.c b/tests/glx/glx-swap-exchange.c index c064a6c1b..3f045f855 100644 --- a/tests/glx/glx-swap-exchange.c +++ b/tests/glx/glx-swap-exchange.c @@ -31,7 +31,7 @@ * exchanged on swap. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-swap-pixmap-bad.c b/tests/glx/glx-swap-pixmap-bad.c index 52a0749d8..c97e1bae6 100644 --- a/tests/glx/glx-swap-pixmap-bad.c +++ b/tests/glx/glx-swap-pixmap-bad.c @@ -32,7 +32,7 @@ * GLXBadDrawable error. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-swap-pixmap.c b/tests/glx/glx-swap-pixmap.c index 7635e0dd8..c557f3aea 100644 --- a/tests/glx/glx-swap-pixmap.c +++ b/tests/glx/glx-swap-pixmap.c @@ -32,7 +32,7 @@ * non-double-buffered GLXFBConfig, or if draw is a GLXPixmap. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-swap-singlebuffer.c b/tests/glx/glx-swap-singlebuffer.c index a747149c6..425ebca23 100644 --- a/tests/glx/glx-swap-singlebuffer.c +++ b/tests/glx/glx-swap-singlebuffer.c @@ -31,7 +31,7 @@ * non-double-buffered GLXFBConfig, or if draw is a GLXPixmap. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/glx/glx-tfp.c b/tests/glx/glx-tfp.c index 413d92048..c27c89a49 100644 --- a/tests/glx/glx-tfp.c +++ b/tests/glx/glx-tfp.c @@ -35,7 +35,7 @@ * Neil Roberts <neil@linux.intel.com>. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "GL/glx.h" #include "X11/extensions/Xrender.h" diff --git a/tests/glx/glx-visuals-depth.c b/tests/glx/glx-visuals-depth.c index 8db98bb2a..13c7cce2a 100644 --- a/tests/glx/glx-visuals-depth.c +++ b/tests/glx/glx-visuals-depth.c @@ -35,7 +35,7 @@ * if we try to enable it. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 20; diff --git a/tests/glx/glx-visuals-stencil.c b/tests/glx/glx-visuals-stencil.c index 12fcfd376..6eaef3857 100644 --- a/tests/glx/glx-visuals-stencil.c +++ b/tests/glx/glx-visuals-stencil.c @@ -35,7 +35,7 @@ * if we try to enable it. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 20; diff --git a/tests/glx/glx-window-life.c b/tests/glx/glx-window-life.c index dc58bbf4d..5e9c50252 100644 --- a/tests/glx/glx-window-life.c +++ b/tests/glx/glx-window-life.c @@ -31,7 +31,7 @@ * destroying a Window should destroy the GLXWindow. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_width = 50, piglit_height = 50; diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s0.c b/tests/hiz/hiz-depth-read-fbo-d24-s0.c index 8a03a04db..256def63b 100644 --- a/tests/hiz/hiz-depth-read-fbo-d24-s0.c +++ b/tests/hiz/hiz-depth-read-fbo-d24-s0.c @@ -30,7 +30,7 @@ * - GL_DEPTH_ATTACHMENT: GL_DEPTH_COMPONENT24 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-read-fbo-d24-s8.c b/tests/hiz/hiz-depth-read-fbo-d24-s8.c index 92c4c4f3b..14cc461f8 100644 --- a/tests/hiz/hiz-depth-read-fbo-d24-s8.c +++ b/tests/hiz/hiz-depth-read-fbo-d24-s8.c @@ -31,7 +31,7 @@ * - GL_STENCIL_ATTACHMENT: GL_STENCIL_INDEX8 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-read-fbo-d24s8.c b/tests/hiz/hiz-depth-read-fbo-d24s8.c index 0fd17c104..b84a10831 100644 --- a/tests/hiz/hiz-depth-read-fbo-d24s8.c +++ b/tests/hiz/hiz-depth-read-fbo-d24s8.c @@ -30,7 +30,7 @@ * - GL_DEPTH_STENCIL_ATTACHMENT: GL_DEPTH24_STENCIL8 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-read-window-stencil0.c b/tests/hiz/hiz-depth-read-window-stencil0.c index 59ade14cc..14adfb331 100644 --- a/tests/hiz/hiz-depth-read-window-stencil0.c +++ b/tests/hiz/hiz-depth-read-window-stencil0.c @@ -28,7 +28,7 @@ * framebuffer for which no stencil buffer was requested. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-read-window-stencil1.c b/tests/hiz/hiz-depth-read-window-stencil1.c index e24c70f89..e211892dd 100644 --- a/tests/hiz/hiz-depth-read-window-stencil1.c +++ b/tests/hiz/hiz-depth-read-window-stencil1.c @@ -28,7 +28,7 @@ * framebuffer for which a stencil buffer was requested. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c index 7d8005c05..6fd2fbd68 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c @@ -38,7 +38,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c index fdbfb49e4..f06995c74 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c @@ -38,7 +38,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c index fa6813412..20cdc7b85 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c @@ -39,7 +39,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c index 623099311..b295c68d5 100644 --- a/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c +++ b/tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c @@ -38,7 +38,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s0.c b/tests/hiz/hiz-depth-test-fbo-d24-s0.c index 534c59644..d072e168e 100644 --- a/tests/hiz/hiz-depth-test-fbo-d24-s0.c +++ b/tests/hiz/hiz-depth-test-fbo-d24-s0.c @@ -35,7 +35,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-test-fbo-d24-s8.c b/tests/hiz/hiz-depth-test-fbo-d24-s8.c index ea12337da..4dc0e8b38 100644 --- a/tests/hiz/hiz-depth-test-fbo-d24-s8.c +++ b/tests/hiz/hiz-depth-test-fbo-d24-s8.c @@ -36,7 +36,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-test-fbo-d24s8.c b/tests/hiz/hiz-depth-test-fbo-d24s8.c index a66b847f3..4bdbb21cb 100644 --- a/tests/hiz/hiz-depth-test-fbo-d24s8.c +++ b/tests/hiz/hiz-depth-test-fbo-d24s8.c @@ -35,7 +35,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-test-window-stencil0.c b/tests/hiz/hiz-depth-test-window-stencil0.c index 3aa11a77c..8b72c0eab 100644 --- a/tests/hiz/hiz-depth-test-window-stencil0.c +++ b/tests/hiz/hiz-depth-test-window-stencil0.c @@ -32,7 +32,7 @@ * framebuffer for which no stencil buffer was requested. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-depth-test-window-stencil1.c b/tests/hiz/hiz-depth-test-window-stencil1.c index 1ad637944..3c4b40a75 100644 --- a/tests/hiz/hiz-depth-test-window-stencil1.c +++ b/tests/hiz/hiz-depth-test-window-stencil1.c @@ -32,7 +32,7 @@ * framebuffer with a stencilbuffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c index 88b9194c2..96849df3b 100644 --- a/tests/hiz/hiz-stencil-read-fbo-d0-s8.c +++ b/tests/hiz/hiz-stencil-read-fbo-d0-s8.c @@ -36,7 +36,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c index 8c70dbd93..2ba2bf770 100644 --- a/tests/hiz/hiz-stencil-read-fbo-d24-s8.c +++ b/tests/hiz/hiz-stencil-read-fbo-d24-s8.c @@ -37,7 +37,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-read-fbo-d24s8.c b/tests/hiz/hiz-stencil-read-fbo-d24s8.c index 440020690..979c25dbe 100644 --- a/tests/hiz/hiz-stencil-read-fbo-d24s8.c +++ b/tests/hiz/hiz-stencil-read-fbo-d24s8.c @@ -36,7 +36,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-read-window-depth0.c b/tests/hiz/hiz-stencil-read-window-depth0.c index 27451c6e8..21efc8b08 100644 --- a/tests/hiz/hiz-stencil-read-window-depth0.c +++ b/tests/hiz/hiz-stencil-read-window-depth0.c @@ -34,7 +34,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-read-window-depth1.c b/tests/hiz/hiz-stencil-read-window-depth1.c index 328c13a83..9bdc38517 100644 --- a/tests/hiz/hiz-stencil-read-window-depth1.c +++ b/tests/hiz/hiz-stencil-read-window-depth1.c @@ -34,7 +34,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c index 285de4c81..404de3bc1 100644 --- a/tests/hiz/hiz-stencil-test-fbo-d0-s8.c +++ b/tests/hiz/hiz-stencil-test-fbo-d0-s8.c @@ -35,7 +35,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c index d2a075dc8..95176a599 100644 --- a/tests/hiz/hiz-stencil-test-fbo-d24-s8.c +++ b/tests/hiz/hiz-stencil-test-fbo-d24-s8.c @@ -36,7 +36,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-test-fbo-d24s8.c b/tests/hiz/hiz-stencil-test-fbo-d24s8.c index d01116dbf..d239f9beb 100644 --- a/tests/hiz/hiz-stencil-test-fbo-d24s8.c +++ b/tests/hiz/hiz-stencil-test-fbo-d24s8.c @@ -35,7 +35,7 @@ * \author Chad Versace <chad.versace@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-test-window-depth0.c b/tests/hiz/hiz-stencil-test-window-depth0.c index fc6466118..47695c198 100644 --- a/tests/hiz/hiz-stencil-test-window-depth0.c +++ b/tests/hiz/hiz-stencil-test-window-depth0.c @@ -32,7 +32,7 @@ * framebuffer for which no depth buffer was requested. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-stencil-test-window-depth1.c b/tests/hiz/hiz-stencil-test-window-depth1.c index 932962f79..fa308c9c8 100644 --- a/tests/hiz/hiz-stencil-test-window-depth1.c +++ b/tests/hiz/hiz-stencil-test-window-depth1.c @@ -32,7 +32,7 @@ * framebuffer with a depth buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/hiz/hiz-util.c b/tests/hiz/hiz-util.c index 83bb671b6..253df9139 100644 --- a/tests/hiz/hiz-util.c +++ b/tests/hiz/hiz-util.c @@ -31,7 +31,7 @@ */ #include <assert.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "hiz/hiz-util.h" #define hiz_probe_common(probe_func, expect) \ diff --git a/tests/hiz/hiz-util.h b/tests/hiz/hiz-util.h index 955cd8587..29171eea2 100644 --- a/tests/hiz/hiz-util.h +++ b/tests/hiz/hiz-util.h @@ -32,7 +32,7 @@ #pragma once -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" struct hiz_fbo_options { GLenum color_format; diff --git a/tests/security/initialized-fbo.c b/tests/security/initialized-fbo.c index 91c7fa031..0b018d3b3 100644 --- a/tests/security/initialized-fbo.c +++ b/tests/security/initialized-fbo.c @@ -34,7 +34,7 @@ * June 2012 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/security/initialized-texmemory.c b/tests/security/initialized-texmemory.c index 9eb66acc2..f9a56d0dd 100644 --- a/tests/security/initialized-texmemory.c +++ b/tests/security/initialized-texmemory.c @@ -34,7 +34,7 @@ * June 2012 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/security/initialized-vbo.c b/tests/security/initialized-vbo.c index 6d2ff0ebc..20c8155f5 100644 --- a/tests/security/initialized-vbo.c +++ b/tests/security/initialized-vbo.c @@ -34,7 +34,7 @@ * June 2012 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN 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; diff --git a/tests/spec/amd_performance_monitor/api.c b/tests/spec/amd_performance_monitor/api.c index 51265017b..ef653cfa1 100644 --- a/tests/spec/amd_performance_monitor/api.c +++ b/tests/spec/amd_performance_monitor/api.c @@ -31,7 +31,7 @@ #define __STDC_FORMAT_MACROS #include <inttypes.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/amd_performance_monitor/measure.c b/tests/spec/amd_performance_monitor/measure.c index 1cc01e8f1..5fe75d521 100644 --- a/tests/spec/amd_performance_monitor/measure.c +++ b/tests/spec/amd_performance_monitor/measure.c @@ -29,7 +29,7 @@ #define __STDC_FORMAT_MACROS #include <inttypes.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c b/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c index 9c639c078..58ef27bc6 100644 --- a/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c +++ b/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/amd_vertex_shader_layer/layered-2d-texture-render.c b/tests/spec/amd_vertex_shader_layer/layered-2d-texture-render.c index 8f8a8c3e5..b645158d2 100644 --- a/tests/spec/amd_vertex_shader_layer/layered-2d-texture-render.c +++ b/tests/spec/amd_vertex_shader_layer/layered-2d-texture-render.c @@ -37,7 +37,7 @@ * that the expected colors appear. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define PAD 5 #define SIZE 64 diff --git a/tests/spec/amd_vertex_shader_layer/layered-depth-texture-render.c b/tests/spec/amd_vertex_shader_layer/layered-depth-texture-render.c index 8e13d6add..33203d695 100644 --- a/tests/spec/amd_vertex_shader_layer/layered-depth-texture-render.c +++ b/tests/spec/amd_vertex_shader_layer/layered-depth-texture-render.c @@ -36,7 +36,7 @@ * then verifies the depth value in each array slice & LOD. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define PAD 5 #define SIZE 64 diff --git a/tests/spec/amd_vertex_shader_viewport_index/render.c b/tests/spec/amd_vertex_shader_viewport_index/render.c index dedce6748..a5c59c96b 100644 --- a/tests/spec/amd_vertex_shader_viewport_index/render.c +++ b/tests/spec/amd_vertex_shader_viewport_index/render.c @@ -37,7 +37,7 @@ * surface. * This extension allows specifying the viewport from the vertex shader. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_base_instance/baseinstance-doesnt-affect-gl-instance-id.c b/tests/spec/arb_base_instance/baseinstance-doesnt-affect-gl-instance-id.c index dfce81e87..354a750af 100644 --- a/tests/spec/arb_base_instance/baseinstance-doesnt-affect-gl-instance-id.c +++ b/tests/spec/arb_base_instance/baseinstance-doesnt-affect-gl-instance-id.c @@ -26,7 +26,7 @@ * not affect the value of gl_InstanceID. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_base_instance/drawarrays.c b/tests/spec/arb_base_instance/drawarrays.c index 6a8036bbb..2386be4be 100644 --- a/tests/spec/arb_base_instance/drawarrays.c +++ b/tests/spec/arb_base_instance/drawarrays.c @@ -27,7 +27,7 @@ * and GL_ARB_instanced_arrays */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-matrix.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c index 12a0dd1fe..7ef6048f0 100644 --- a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c +++ b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c @@ -27,7 +27,7 @@ * * \author Ian Romanick + Dave Airlie (extended tests) */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_blend_func_extended/api/blend-api.c b/tests/spec/arb_blend_func_extended/api/blend-api.c index b6f131f2f..00e4c7b4e 100644 --- a/tests/spec/arb_blend_func_extended/api/blend-api.c +++ b/tests/spec/arb_blend_func_extended/api/blend-api.c @@ -26,7 +26,7 @@ * \author Dave Airlie * Test additions to blending API from ARB_blend_func_extended */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_blend_func_extended/api/error-at-begin.c b/tests/spec/arb_blend_func_extended/api/error-at-begin.c index e68402bc1..da0950127 100644 --- a/tests/spec/arb_blend_func_extended/api/error-at-begin.c +++ b/tests/spec/arb_blend_func_extended/api/error-at-begin.c @@ -32,7 +32,7 @@ * ONE_MINUS_SRC1_ALPHA), and a framebuffer is bound that has more than * the value of MAX_DUAL_SOURCE_DRAW_BUFFERS-1 active color attachements." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c index f18158361..3fb8aa8b7 100644 --- a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c +++ b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c @@ -26,7 +26,7 @@ * \author Dave Airlie * heavily inspired by getfragdatalocation.c from Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c index abc467595..a6450b8f4 100644 --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c @@ -35,7 +35,7 @@ * so just have the initial test validate that */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c index d4e976a7f..523d07c07 100644 --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c @@ -35,7 +35,7 @@ * so just have the initial test validate that */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_buffer_storage/bufferstorage.c b/tests/spec/arb_buffer_storage/bufferstorage.c index f054f1777..316a10fd4 100644 --- a/tests/spec/arb_buffer_storage/bufferstorage.c +++ b/tests/spec/arb_buffer_storage/bufferstorage.c @@ -30,7 +30,7 @@ * from ARB_buffer_storage. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/common.c b/tests/spec/arb_clear_buffer_object/common.c index 5f3b832ac..b0e75fcc9 100644 --- a/tests/spec/arb_clear_buffer_object/common.c +++ b/tests/spec/arb_clear_buffer_object/common.c @@ -27,7 +27,7 @@ * Common routines to fill or check array buffer data. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /* Check that the range of ARRAY_BUFFER specified with <ofs> and <length> * is filled with chunks of data of length <expected_data_size>. diff --git a/tests/spec/arb_clear_buffer_object/formats.c b/tests/spec/arb_clear_buffer_object/formats.c index fb36b00f1..f6b008b6e 100644 --- a/tests/spec/arb_clear_buffer_object/formats.c +++ b/tests/spec/arb_clear_buffer_object/formats.c @@ -29,7 +29,7 @@ * format conversion. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/invalid-internal-format.c b/tests/spec/arb_clear_buffer_object/invalid-internal-format.c index e28032a08..8e87c73aa 100644 --- a/tests/spec/arb_clear_buffer_object/invalid-internal-format.c +++ b/tests/spec/arb_clear_buffer_object/invalid-internal-format.c @@ -41,7 +41,7 @@ * Test that the required GL_INVALID_ENUM error is generated for these formats. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/invalid-size.c b/tests/spec/arb_clear_buffer_object/invalid-size.c index 42e2d8e9b..b8e0dbcd4 100644 --- a/tests/spec/arb_clear_buffer_object/invalid-size.c +++ b/tests/spec/arb_clear_buffer_object/invalid-size.c @@ -37,7 +37,7 @@ * is not a multiple of the internal format size. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/mapped.c b/tests/spec/arb_clear_buffer_object/mapped.c index 7715f70b9..59cf4f8e1 100644 --- a/tests/spec/arb_clear_buffer_object/mapped.c +++ b/tests/spec/arb_clear_buffer_object/mapped.c @@ -29,7 +29,7 @@ * of the buffer bound to <target> is currently mapped." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/no-bound-buffer.c b/tests/spec/arb_clear_buffer_object/no-bound-buffer.c index 9230d2a41..040a0f51f 100644 --- a/tests/spec/arb_clear_buffer_object/no-bound-buffer.c +++ b/tests/spec/arb_clear_buffer_object/no-bound-buffer.c @@ -29,7 +29,7 @@ * the binding point indicated by <target>." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/null-data.c b/tests/spec/arb_clear_buffer_object/null-data.c index 652d56568..bab72654a 100644 --- a/tests/spec/arb_clear_buffer_object/null-data.c +++ b/tests/spec/arb_clear_buffer_object/null-data.c @@ -29,7 +29,7 @@ * buffer is filled with zeros." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/sub-invalid-size.c b/tests/spec/arb_clear_buffer_object/sub-invalid-size.c index 4721e1ba1..ddd573056 100644 --- a/tests/spec/arb_clear_buffer_object/sub-invalid-size.c +++ b/tests/spec/arb_clear_buffer_object/sub-invalid-size.c @@ -34,7 +34,7 @@ * otherwise the error INVALID_VALUE is generated." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/sub-mapped.c b/tests/spec/arb_clear_buffer_object/sub-mapped.c index 914b07432..ed6b30268 100644 --- a/tests/spec/arb_clear_buffer_object/sub-mapped.c +++ b/tests/spec/arb_clear_buffer_object/sub-mapped.c @@ -32,7 +32,7 @@ * while the lower half is mapped. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/sub-overlap.c b/tests/spec/arb_clear_buffer_object/sub-overlap.c index a04d01878..7e887c0e0 100644 --- a/tests/spec/arb_clear_buffer_object/sub-overlap.c +++ b/tests/spec/arb_clear_buffer_object/sub-overlap.c @@ -27,7 +27,7 @@ * Clear multiple overlapping ranges of a buffer and check the result. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/sub-simple.c b/tests/spec/arb_clear_buffer_object/sub-simple.c index c33c295c8..13b9ee9c6 100644 --- a/tests/spec/arb_clear_buffer_object/sub-simple.c +++ b/tests/spec/arb_clear_buffer_object/sub-simple.c @@ -27,7 +27,7 @@ * Clear a range of a buffer and check the result. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_buffer_object/zero-size.c b/tests/spec/arb_clear_buffer_object/zero-size.c index 607f32d6c..3c1443e84 100644 --- a/tests/spec/arb_clear_buffer_object/zero-size.c +++ b/tests/spec/arb_clear_buffer_object/zero-size.c @@ -27,7 +27,7 @@ * Clear with size set to zero and verify that the buffer data was not altered. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_texture/3d.c b/tests/spec/arb_clear_texture/3d.c index b7efcb5b3..4de1ff1ef 100644 --- a/tests/spec/arb_clear_texture/3d.c +++ b/tests/spec/arb_clear_texture/3d.c @@ -34,7 +34,7 @@ #define TEX_HEIGHT 4 #define TEX_DEPTH 4 -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_clear_texture/common.h b/tests/spec/arb_clear_texture/common.h index 9262cd075..8ae421604 100644 --- a/tests/spec/arb_clear_texture/common.h +++ b/tests/spec/arb_clear_texture/common.h @@ -23,7 +23,7 @@ * Author: Neil Roberts <neil@linux.intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" struct format { GLenum internalFormat; diff --git a/tests/spec/arb_clear_texture/cube.c b/tests/spec/arb_clear_texture/cube.c index 43df5075e..65b076d8c 100644 --- a/tests/spec/arb_clear_texture/cube.c +++ b/tests/spec/arb_clear_texture/cube.c @@ -28,7 +28,7 @@ * the faces are rendered and probed. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" struct vertex { float pos; diff --git a/tests/spec/arb_clear_texture/simple.c b/tests/spec/arb_clear_texture/simple.c index 7e42a34b5..29c6f800d 100644 --- a/tests/spec/arb_clear_texture/simple.c +++ b/tests/spec/arb_clear_texture/simple.c @@ -37,7 +37,7 @@ * With the boxes from left to right being green, blue, and yellow. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_color_buffer_float/common.h b/tests/spec/arb_color_buffer_float/common.h index 0a30c9134..c0b0159f8 100644 --- a/tests/spec/arb_color_buffer_float/common.h +++ b/tests/spec/arb_color_buffer_float/common.h @@ -30,7 +30,7 @@ * different ways! */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_compute_shader/api_errors.c b/tests/spec/arb_compute_shader/api_errors.c index fbc012157..0c17799f1 100644 --- a/tests/spec/arb_compute_shader/api_errors.c +++ b/tests/spec/arb_compute_shader/api_errors.c @@ -27,7 +27,7 @@ * generate an error. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-shader.h" diff --git a/tests/spec/arb_compute_shader/compiler/work_group_size_too_large.c b/tests/spec/arb_compute_shader/compiler/work_group_size_too_large.c index 44052b67f..5c73cfad1 100644 --- a/tests/spec/arb_compute_shader/compiler/work_group_size_too_large.c +++ b/tests/spec/arb_compute_shader/compiler/work_group_size_too_large.c @@ -38,7 +38,7 @@ * assume that this is reported at compile time as well. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <math.h> #include <limits.h> diff --git a/tests/spec/arb_compute_shader/minmax.c b/tests/spec/arb_compute_shader/minmax.c index 9df6d9b54..5bb7795e0 100644 --- a/tests/spec/arb_compute_shader/minmax.c +++ b/tests/spec/arb_compute_shader/minmax.c @@ -27,7 +27,7 @@ * ARB_compute_shader extension. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c index 604816ea9..b78fdca5a 100644 --- a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c +++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define COPY_BUFFER_SIZE (4<<20) uint8_t src_data[COPY_BUFFER_SIZE]; diff --git a/tests/spec/arb_copy_buffer/copybuffersubdata.c b/tests/spec/arb_copy_buffer/copybuffersubdata.c index 8d007e74c..3c60d1a14 100644 --- a/tests/spec/arb_copy_buffer/copybuffersubdata.c +++ b/tests/spec/arb_copy_buffer/copybuffersubdata.c @@ -28,7 +28,7 @@ * Jan 2012 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/data-sync.c b/tests/spec/arb_copy_buffer/data-sync.c index 1faf632dc..1cc879712 100644 --- a/tests/spec/arb_copy_buffer/data-sync.c +++ b/tests/spec/arb_copy_buffer/data-sync.c @@ -31,7 +31,7 @@ * after the copy does have an effect. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/dlist.c b/tests/spec/arb_copy_buffer/dlist.c index c21a36b8f..b7ad2aa19 100644 --- a/tests/spec/arb_copy_buffer/dlist.c +++ b/tests/spec/arb_copy_buffer/dlist.c @@ -31,7 +31,7 @@ * CopyBufferSubData" */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/get.c b/tests/spec/arb_copy_buffer/get.c index 2021986d7..31bebf74a 100644 --- a/tests/spec/arb_copy_buffer/get.c +++ b/tests/spec/arb_copy_buffer/get.c @@ -26,7 +26,7 @@ * Tests that the getters for the new binding points in GL_ARB_copy_buffer work. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/negative-bound-zero.c b/tests/spec/arb_copy_buffer/negative-bound-zero.c index 6d3223050..c7dd478fc 100644 --- a/tests/spec/arb_copy_buffer/negative-bound-zero.c +++ b/tests/spec/arb_copy_buffer/negative-bound-zero.c @@ -29,7 +29,7 @@ * readtarget or writetarget." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/negative-bounds.c b/tests/spec/arb_copy_buffer/negative-bounds.c index af014242c..fbc4ae848 100644 --- a/tests/spec/arb_copy_buffer/negative-bounds.c +++ b/tests/spec/arb_copy_buffer/negative-bounds.c @@ -35,7 +35,7 @@ * error checking doesn't fail copies within the bounds. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/negative-mapped.c b/tests/spec/arb_copy_buffer/negative-mapped.c index aff65ec25..2f8f7985d 100644 --- a/tests/spec/arb_copy_buffer/negative-mapped.c +++ b/tests/spec/arb_copy_buffer/negative-mapped.c @@ -29,7 +29,7 @@ * bound to either readtarget or writetarget are mapped." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/overlap.c b/tests/spec/arb_copy_buffer/overlap.c index dda17e2bf..fce3bb036 100644 --- a/tests/spec/arb_copy_buffer/overlap.c +++ b/tests/spec/arb_copy_buffer/overlap.c @@ -34,7 +34,7 @@ * overlap, but with one buffer being both src and dst. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/subdata-sync.c b/tests/spec/arb_copy_buffer/subdata-sync.c index 0408af0a3..e8e474077 100644 --- a/tests/spec/arb_copy_buffer/subdata-sync.c +++ b/tests/spec/arb_copy_buffer/subdata-sync.c @@ -31,7 +31,7 @@ * does have an effect. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_copy_buffer/targets.c b/tests/spec/arb_copy_buffer/targets.c index 56f5143d4..ca6c94f93 100644 --- a/tests/spec/arb_copy_buffer/targets.c +++ b/tests/spec/arb_copy_buffer/targets.c @@ -45,7 +45,7 @@ * that copies work for them. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_debug_output/api_error.c b/tests/spec/arb_debug_output/api_error.c index 8f00b1cfc..596092f45 100644 --- a/tests/spec/arb_debug_output/api_error.c +++ b/tests/spec/arb_debug_output/api_error.c @@ -22,7 +22,7 @@ * SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_depth_clamp/depth-clamp-status.c b/tests/spec/arb_depth_clamp/depth-clamp-status.c index 4a459fabf..6a0d7d46a 100644 --- a/tests/spec/arb_depth_clamp/depth-clamp-status.c +++ b/tests/spec/arb_depth_clamp/depth-clamp-status.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/spec/arb_draw_buffers/state_change.c b/tests/spec/arb_draw_buffers/state_change.c index 9104b7fe0..e067d77a9 100644 --- a/tests/spec/arb_draw_buffers/state_change.c +++ b/tests/spec/arb_draw_buffers/state_change.c @@ -29,7 +29,7 @@ * It would then fail to enable the second buffer again because it was already * pointing to the new buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_elements_base_vertex/bounds.c b/tests/spec/arb_draw_elements_base_vertex/bounds.c index db150dbd9..cd9af45fd 100644 --- a/tests/spec/arb_draw_elements_base_vertex/bounds.c +++ b/tests/spec/arb_draw_elements_base_vertex/bounds.c @@ -33,7 +33,7 @@ * In Mesa Gallium 7.11 this causes a crash. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_elements_base_vertex/dlist.c b/tests/spec/arb_draw_elements_base_vertex/dlist.c index 8f63adfa8..08b652908 100644 --- a/tests/spec/arb_draw_elements_base_vertex/dlist.c +++ b/tests/spec/arb_draw_elements_base_vertex/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file dlist-arb_draw_instanced.c diff --git a/tests/spec/arb_draw_elements_base_vertex/drawelements-instanced.c b/tests/spec/arb_draw_elements_base_vertex/drawelements-instanced.c index e8399a987..e82de0592 100644 --- a/tests/spec/arb_draw_elements_base_vertex/drawelements-instanced.c +++ b/tests/spec/arb_draw_elements_base_vertex/drawelements-instanced.c @@ -33,7 +33,7 @@ * color modifier and an y offset. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_elements_base_vertex/drawelements.c b/tests/spec/arb_draw_elements_base_vertex/drawelements.c index a5e8e2a24..457e92b3d 100644 --- a/tests/spec/arb_draw_elements_base_vertex/drawelements.c +++ b/tests/spec/arb_draw_elements_base_vertex/drawelements.c @@ -30,7 +30,7 @@ * index buffers. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_elements_base_vertex/drawrangeelements.c b/tests/spec/arb_draw_elements_base_vertex/drawrangeelements.c index 9251374c5..1df970175 100644 --- a/tests/spec/arb_draw_elements_base_vertex/drawrangeelements.c +++ b/tests/spec/arb_draw_elements_base_vertex/drawrangeelements.c @@ -47,7 +47,7 @@ * (8)-------(9) while 4 will be green. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_elements_base_vertex/multidrawelements.c b/tests/spec/arb_draw_elements_base_vertex/multidrawelements.c index 0314ee21b..49e942352 100644 --- a/tests/spec/arb_draw_elements_base_vertex/multidrawelements.c +++ b/tests/spec/arb_draw_elements_base_vertex/multidrawelements.c @@ -50,7 +50,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_elements_base_vertex/negative-index.c b/tests/spec/arb_draw_elements_base_vertex/negative-index.c index 9cee94751..e0667d3d2 100644 --- a/tests/spec/arb_draw_elements_base_vertex/negative-index.c +++ b/tests/spec/arb_draw_elements_base_vertex/negative-index.c @@ -24,7 +24,7 @@ * Marek Olšák <maraeo@gmail.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_indirect/api-errors.c b/tests/spec/arb_draw_indirect/api-errors.c index 67d75d561..dfa93e48a 100644 --- a/tests/spec/arb_draw_indirect/api-errors.c +++ b/tests/spec/arb_draw_indirect/api-errors.c @@ -24,7 +24,7 @@ /* Test error behavior for GL_ARB_draw_indirect */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_indirect/draw-arrays-base-instance.c b/tests/spec/arb_draw_indirect/draw-arrays-base-instance.c index b20950983..a08394826 100644 --- a/tests/spec/arb_draw_indirect/draw-arrays-base-instance.c +++ b/tests/spec/arb_draw_indirect/draw-arrays-base-instance.c @@ -24,7 +24,7 @@ /* Basic test of glDrawArraysIndirect interaction with base instance */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_indirect/draw-arrays-instances.c b/tests/spec/arb_draw_indirect/draw-arrays-instances.c index 1d7c24079..0e65db86c 100644 --- a/tests/spec/arb_draw_indirect/draw-arrays-instances.c +++ b/tests/spec/arb_draw_indirect/draw-arrays-instances.c @@ -24,7 +24,7 @@ /* Basic test of glDrawElementsIndirect */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_indirect/draw-arrays.c b/tests/spec/arb_draw_indirect/draw-arrays.c index 3c03d75a6..9f1ecc6cf 100644 --- a/tests/spec/arb_draw_indirect/draw-arrays.c +++ b/tests/spec/arb_draw_indirect/draw-arrays.c @@ -24,7 +24,7 @@ /* Basic test of glDrawArraysIndirect */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_indirect/draw-elements-base-instance.c b/tests/spec/arb_draw_indirect/draw-elements-base-instance.c index acd4a9e51..98817c8e4 100644 --- a/tests/spec/arb_draw_indirect/draw-elements-base-instance.c +++ b/tests/spec/arb_draw_indirect/draw-elements-base-instance.c @@ -24,7 +24,7 @@ /* Basic test of glDrawElementsIndirect interaction with base instance */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_indirect/draw-elements-prim-restart-ugly.c b/tests/spec/arb_draw_indirect/draw-elements-prim-restart-ugly.c index 5e348af9e..51eef9b9c 100644 --- a/tests/spec/arb_draw_indirect/draw-elements-prim-restart-ugly.c +++ b/tests/spec/arb_draw_indirect/draw-elements-prim-restart-ugly.c @@ -25,7 +25,7 @@ /* Basic test of glDrawElementsIndirect interaction with primitive restart, * with a weird cut index. This requires a fallback on Ivybridge. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_indirect/draw-elements-prim-restart.c b/tests/spec/arb_draw_indirect/draw-elements-prim-restart.c index 60c046557..3f0435eb4 100644 --- a/tests/spec/arb_draw_indirect/draw-elements-prim-restart.c +++ b/tests/spec/arb_draw_indirect/draw-elements-prim-restart.c @@ -24,7 +24,7 @@ /* Basic test of glDrawElementsIndirect interaction with primitive restart */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_indirect/draw-elements.c b/tests/spec/arb_draw_indirect/draw-elements.c index 26069a32c..deb27e727 100644 --- a/tests/spec/arb_draw_indirect/draw-elements.c +++ b/tests/spec/arb_draw_indirect/draw-elements.c @@ -24,7 +24,7 @@ /* Basic test of glDrawElementsIndirect */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_instanced/execution/dlist.c b/tests/spec/arb_draw_instanced/execution/dlist.c index 615a589ad..a4c1f1d3b 100644 --- a/tests/spec/arb_draw_instanced/execution/dlist.c +++ b/tests/spec/arb_draw_instanced/execution/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file dlist.c diff --git a/tests/spec/arb_draw_instanced/execution/drawarrays.c b/tests/spec/arb_draw_instanced/execution/drawarrays.c index d66f0c12c..fc2ee6c7d 100644 --- a/tests/spec/arb_draw_instanced/execution/drawarrays.c +++ b/tests/spec/arb_draw_instanced/execution/drawarrays.c @@ -27,7 +27,7 @@ * Tests GL_ARB_draw_instanced */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_instanced/execution/elements.c b/tests/spec/arb_draw_instanced/execution/elements.c index 84eed7900..a40e2caaf 100644 --- a/tests/spec/arb_draw_instanced/execution/elements.c +++ b/tests/spec/arb_draw_instanced/execution/elements.c @@ -31,7 +31,7 @@ * glDrawArraysInstancedARB(). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c index e055e96c0..5361c6cba 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c +++ b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file negative-arrays-first-negative.c diff --git a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c index 158514ee5..1885fb80b 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c +++ b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file negative-elements-type.c diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c index 52065b2d9..eb155c1a4 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c @@ -27,7 +27,7 @@ * glDepthRange) and that it works. Based on general/depth-clamp-range.c. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c index 67ef57d9b..0413534c0 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c @@ -28,7 +28,7 @@ * INCOMPLETE_READ_BUFFER with ARB_ES2_compatibility. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c index 2f5927943..44d76b89f 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c @@ -22,7 +22,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <stdarg.h> PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c index 0eef3b194..b6b7b85ec 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c @@ -33,7 +33,7 @@ * if \c GL_OES_fragment_precision_high is supported. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c index 4bc409903..ee8a30559 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c @@ -26,7 +26,7 @@ * Tests that MAX_*_VECTORS = MAX_*_COMPONENTS / 4. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c index 0550bd608..b5c476ec6 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c @@ -31,7 +31,7 @@ * glReleaseShaderCompiler(). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c index 7e711677a..335c08845 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c @@ -27,7 +27,7 @@ * SHADER_COMPILER being present. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c index 9207a9222..f2e8647e6 100644 --- a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c +++ b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c @@ -54,7 +54,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c index 7b7692dae..381253c5e 100644 --- a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c +++ b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c @@ -41,7 +41,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_explicit_attrib_location/overlapping-locations-input-attribs.c b/tests/spec/arb_explicit_attrib_location/overlapping-locations-input-attribs.c index 5fd1296af..f7085c7d1 100644 --- a/tests/spec/arb_explicit_attrib_location/overlapping-locations-input-attribs.c +++ b/tests/spec/arb_explicit_attrib_location/overlapping-locations-input-attribs.c @@ -41,7 +41,7 @@ * under the constraints defined in OpenGL spec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_explicit_uniform_location/array-elements.c b/tests/spec/arb_explicit_uniform_location/array-elements.c index 700194170..72cb78412 100644 --- a/tests/spec/arb_explicit_uniform_location/array-elements.c +++ b/tests/spec/arb_explicit_uniform_location/array-elements.c @@ -30,7 +30,7 @@ * "Individual elements of a uniform array are assigned consecutive * locations with the first element taking location <location>." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_explicit_uniform_location/inactive-uniform.c b/tests/spec/arb_explicit_uniform_location/inactive-uniform.c index 527b2da44..dcc7256aa 100644 --- a/tests/spec/arb_explicit_uniform_location/inactive-uniform.c +++ b/tests/spec/arb_explicit_uniform_location/inactive-uniform.c @@ -43,7 +43,7 @@ * RESOLVED: The call is ignored for inactive uniform variables and * no error is generated." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_explicit_uniform_location/loc-boundaries.c b/tests/spec/arb_explicit_uniform_location/loc-boundaries.c index ac840280b..769fcd450 100644 --- a/tests/spec/arb_explicit_uniform_location/loc-boundaries.c +++ b/tests/spec/arb_explicit_uniform_location/loc-boundaries.c @@ -39,7 +39,7 @@ * also uniform without explicit location to see that it does not affect * getting the wanted locations. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_explicit_uniform_location/minmax.c b/tests/spec/arb_explicit_uniform_location/minmax.c index 970aebc52..a46da19c6 100644 --- a/tests/spec/arb_explicit_uniform_location/minmax.c +++ b/tests/spec/arb_explicit_uniform_location/minmax.c @@ -25,7 +25,7 @@ * \file minmax.c */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_fragment_program/minmax.c b/tests/spec/arb_fragment_program/minmax.c index 4150fb185..b0d0d9f7f 100644 --- a/tests/spec/arb_fragment_program/minmax.c +++ b/tests/spec/arb_fragment_program/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum values in GL_ARB_fragment_program. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_fragment_program/sparse-samplers.c b/tests/spec/arb_fragment_program/sparse-samplers.c index de0b40ee9..948a8cda8 100644 --- a/tests/spec/arb_fragment_program/sparse-samplers.c +++ b/tests/spec/arb_fragment_program/sparse-samplers.c @@ -26,7 +26,7 @@ * contiguously starting from 0. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_framebuffer_object/fbo-drawbuffers-none.c b/tests/spec/arb_framebuffer_object/fbo-drawbuffers-none.c index c0d68399d..f7ddb450b 100644 --- a/tests/spec/arb_framebuffer_object/fbo-drawbuffers-none.c +++ b/tests/spec/arb_framebuffer_object/fbo-drawbuffers-none.c @@ -40,7 +40,7 @@ * \author Marek Olšák <marek.olsak@amd.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c b/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c index ae238cefd..92b36e99c 100644 --- a/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c +++ b/tests/spec/arb_framebuffer_object/framebuffer-blit-levels.c @@ -52,7 +52,7 @@ * test texture). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c index f6f6e8298..e08c1bd01 100644 --- a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c +++ b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c @@ -29,7 +29,7 @@ */ #include <stdio.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "../../fbo/fbo-formats.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_framebuffer_object/negative-readpixels-no-rb.c b/tests/spec/arb_framebuffer_object/negative-readpixels-no-rb.c index df4706df8..19df7f894 100644 --- a/tests/spec/arb_framebuffer_object/negative-readpixels-no-rb.c +++ b/tests/spec/arb_framebuffer_object/negative-readpixels-no-rb.c @@ -28,7 +28,7 @@ */ #include <stdio.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c index e2285a03b..baccbe8e9 100644 --- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c +++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c @@ -29,7 +29,7 @@ */ #include <stdio.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c index 6c126c287..9d8e5f5cc 100644 --- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c +++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c @@ -30,7 +30,7 @@ */ #include <stdio.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_framebuffer_srgb/blit.c b/tests/spec/arb_framebuffer_srgb/blit.c index e3f8ea0ee..5f971b62b 100644 --- a/tests/spec/arb_framebuffer_srgb/blit.c +++ b/tests/spec/arb_framebuffer_srgb/blit.c @@ -110,7 +110,7 @@ * exhaustively test a wide variety of scaling behaviours. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" const int PATTERN_WIDTH = 256; const int PATTERN_HEIGHT = 64; diff --git a/tests/spec/arb_framebuffer_srgb/pushpop.c b/tests/spec/arb_framebuffer_srgb/pushpop.c index 1f6b3a773..bcec1a165 100644 --- a/tests/spec/arb_framebuffer_srgb/pushpop.c +++ b/tests/spec/arb_framebuffer_srgb/pushpop.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file pushpop.c diff --git a/tests/spec/arb_framebuffer_srgb/srgb_conformance.c b/tests/spec/arb_framebuffer_srgb/srgb_conformance.c index 508239d82..94df79700 100644 --- a/tests/spec/arb_framebuffer_srgb/srgb_conformance.c +++ b/tests/spec/arb_framebuffer_srgb/srgb_conformance.c @@ -41,7 +41,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_geometry_shader4/execution/ignore-adjacent-vertices.c b/tests/spec/arb_geometry_shader4/execution/ignore-adjacent-vertices.c index 04599dc3c..22152894f 100644 --- a/tests/spec/arb_geometry_shader4/execution/ignore-adjacent-vertices.c +++ b/tests/spec/arb_geometry_shader4/execution/ignore-adjacent-vertices.c @@ -33,7 +33,7 @@ * "If a geometry shader is not active, the "adjacent" vertices are ignored." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" struct primitive { GLenum type; diff --git a/tests/spec/arb_geometry_shader4/execution/program-parameter/common.h b/tests/spec/arb_geometry_shader4/execution/program-parameter/common.h index 251bad40d..938f7d21c 100644 --- a/tests/spec/arb_geometry_shader4/execution/program-parameter/common.h +++ b/tests/spec/arb_geometry_shader4/execution/program-parameter/common.h @@ -27,7 +27,7 @@ * Common code for glProgramParameter testing. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" struct primitive_geom_info { diff --git a/tests/spec/arb_geometry_shader4/execution/vertices-in.c b/tests/spec/arb_geometry_shader4/execution/vertices-in.c index 1ced7fedd..22084d7f5 100644 --- a/tests/spec/arb_geometry_shader4/execution/vertices-in.c +++ b/tests/spec/arb_geometry_shader4/execution/vertices-in.c @@ -30,7 +30,7 @@ * gl_VerticesIn out of the shader. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_get_program_binary/api-errors.c b/tests/spec/arb_get_program_binary/api-errors.c index fd51cf33d..bd4e0f6fc 100644 --- a/tests/spec/arb_get_program_binary/api-errors.c +++ b/tests/spec/arb_get_program_binary/api-errors.c @@ -30,7 +30,7 @@ * overrun test. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_get_program_binary/overrun.c b/tests/spec/arb_get_program_binary/overrun.c index c708ad0ae..dd7ba6360 100644 --- a/tests/spec/arb_get_program_binary/overrun.c +++ b/tests/spec/arb_get_program_binary/overrun.c @@ -26,7 +26,7 @@ * Verify that queries don't over-run the size of the supplied buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <stdlib.h> PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_get_program_binary/retrievable_hint.c b/tests/spec/arb_get_program_binary/retrievable_hint.c index 7c5f3161c..2cea63316 100644 --- a/tests/spec/arb_get_program_binary/retrievable_hint.c +++ b/tests/spec/arb_get_program_binary/retrievable_hint.c @@ -30,7 +30,7 @@ * overrun test. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_gpu_shader5/compiler/invocations_count_too_large.c b/tests/spec/arb_gpu_shader5/compiler/invocations_count_too_large.c index 5750807c2..cf0dd5fdc 100644 --- a/tests/spec/arb_gpu_shader5/compiler/invocations_count_too_large.c +++ b/tests/spec/arb_gpu_shader5/compiler/invocations_count_too_large.c @@ -35,7 +35,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_gpu_shader5/execution/invocation-id.c b/tests/spec/arb_gpu_shader5/execution/invocation-id.c index b723516c6..1a2d70e3c 100644 --- a/tests/spec/arb_gpu_shader5/execution/invocation-id.c +++ b/tests/spec/arb_gpu_shader5/execution/invocation-id.c @@ -26,7 +26,7 @@ * Verifies reading GL_GEOMETRY_SHADER_INVOCATIONS */ - #include "piglit-util-gl-common.h" + #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_gpu_shader5/execution/xfb-streams.c b/tests/spec/arb_gpu_shader5/execution/xfb-streams.c index 67163dff8..000c3618f 100644 --- a/tests/spec/arb_gpu_shader5/execution/xfb-streams.c +++ b/tests/spec/arb_gpu_shader5/execution/xfb-streams.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file xfb-streams.c diff --git a/tests/spec/arb_gpu_shader5/minmax.c b/tests/spec/arb_gpu_shader5/minmax.c index a50412bab..397775353 100644 --- a/tests/spec/arb_gpu_shader5/minmax.c +++ b/tests/spec/arb_gpu_shader5/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum values in GL_ARB_gpu_shader5. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_instanced_arrays/drawarrays.c b/tests/spec/arb_instanced_arrays/drawarrays.c index c40471988..266b52820 100644 --- a/tests/spec/arb_instanced_arrays/drawarrays.c +++ b/tests/spec/arb_instanced_arrays/drawarrays.c @@ -27,7 +27,7 @@ * Tests GL_ARB_draw_instanced and GL_ARB_instanced_arrays */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_instanced_arrays/instanced_arrays.c b/tests/spec/arb_instanced_arrays/instanced_arrays.c index 083ae9425..f6eb8ac7f 100644 --- a/tests/spec/arb_instanced_arrays/instanced_arrays.c +++ b/tests/spec/arb_instanced_arrays/instanced_arrays.c @@ -27,7 +27,7 @@ * Tests GL_ARB_instanced_arrays */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_instanced_arrays/vertex-attrib-divisor-index-error.c b/tests/spec/arb_instanced_arrays/vertex-attrib-divisor-index-error.c index 993bc57e8..b41912c47 100644 --- a/tests/spec/arb_instanced_arrays/vertex-attrib-divisor-index-error.c +++ b/tests/spec/arb_instanced_arrays/vertex-attrib-divisor-index-error.c @@ -31,7 +31,7 @@ * value of MAX_VERTEX_ATTRIBS." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_internalformat_query/api-errors.c b/tests/spec/arb_internalformat_query/api-errors.c index 6381362dd..ee21c177b 100644 --- a/tests/spec/arb_internalformat_query/api-errors.c +++ b/tests/spec/arb_internalformat_query/api-errors.c @@ -28,7 +28,7 @@ * None of these subtests is large enough to warrant a separate test case. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_internalformat_query/minmax.c b/tests/spec/arb_internalformat_query/minmax.c index 0266451bf..9a9d8f632 100644 --- a/tests/spec/arb_internalformat_query/minmax.c +++ b/tests/spec/arb_internalformat_query/minmax.c @@ -28,7 +28,7 @@ */ #include <limits.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_internalformat_query/overrun.c b/tests/spec/arb_internalformat_query/overrun.c index bfa01bb41..4aec2896f 100644 --- a/tests/spec/arb_internalformat_query/overrun.c +++ b/tests/spec/arb_internalformat_query/overrun.c @@ -26,7 +26,7 @@ * Verify that queries don't over-run the size of the supplied buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_map_buffer_alignment/sanity_test.c b/tests/spec/arb_map_buffer_alignment/sanity_test.c index 2cc41315e..77ae80310 100644 --- a/tests/spec/arb_map_buffer_alignment/sanity_test.c +++ b/tests/spec/arb_map_buffer_alignment/sanity_test.c @@ -22,7 +22,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_map_buffer_range/invalidate.c b/tests/spec/arb_map_buffer_range/invalidate.c index d10b9f3b1..8fb3996d8 100644 --- a/tests/spec/arb_map_buffer_range/invalidate.c +++ b/tests/spec/arb_map_buffer_range/invalidate.c @@ -33,7 +33,7 @@ * if ARB_map_buffer_alignment is supported. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c index 56f6f23b8..fabc2033c 100644 --- a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c +++ b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c @@ -26,7 +26,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c index 64113c7ca..213209226 100644 --- a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c +++ b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_multisample/beginend.c b/tests/spec/arb_multisample/beginend.c index fed9e1703..5d2a5b40b 100644 --- a/tests/spec/arb_multisample/beginend.c +++ b/tests/spec/arb_multisample/beginend.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file beginend.c diff --git a/tests/spec/arb_multisample/pushpop.c b/tests/spec/arb_multisample/pushpop.c index 72c46770b..a17043129 100644 --- a/tests/spec/arb_multisample/pushpop.c +++ b/tests/spec/arb_multisample/pushpop.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file pushpop.c diff --git a/tests/spec/arb_occlusion_query/gen_delete_while_active.c b/tests/spec/arb_occlusion_query/gen_delete_while_active.c index dd3c7c84c..fcf98933e 100644 --- a/tests/spec/arb_occlusion_query/gen_delete_while_active.c +++ b/tests/spec/arb_occlusion_query/gen_delete_while_active.c @@ -33,7 +33,7 @@ * glDeleteQuery can be called on an active query object. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_occlusion_query/occlusion_query.c b/tests/spec/arb_occlusion_query/occlusion_query.c index e099f0691..c71c81041 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query.c +++ b/tests/spec/arb_occlusion_query/occlusion_query.c @@ -29,7 +29,7 @@ * Simple test for GL_ARB_occlusion_query. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_occlusion_query/occlusion_query_lifetime.c b/tests/spec/arb_occlusion_query/occlusion_query_lifetime.c index 1e8b5d45c..37a15cb14 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query_lifetime.c +++ b/tests/spec/arb_occlusion_query/occlusion_query_lifetime.c @@ -32,7 +32,7 @@ * of a query's lifetime. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_occlusion_query/occlusion_query_meta_fragments.c b/tests/spec/arb_occlusion_query/occlusion_query_meta_fragments.c index 6a7dc2b3e..3ce398a96 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query_meta_fragments.c +++ b/tests/spec/arb_occlusion_query/occlusion_query_meta_fragments.c @@ -33,7 +33,7 @@ * fragments as specified. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c b/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c index 0973b3e2d..5e237a147 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c +++ b/tests/spec/arb_occlusion_query/occlusion_query_meta_no_fragments.c @@ -33,7 +33,7 @@ * fragments as specified. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_occlusion_query/occlusion_query_order.c b/tests/spec/arb_occlusion_query/occlusion_query_order.c index 18269316e..ea4c8405d 100644 --- a/tests/spec/arb_occlusion_query/occlusion_query_order.c +++ b/tests/spec/arb_occlusion_query/occlusion_query_order.c @@ -37,7 +37,7 @@ * return TRUE. [OpenGL 3.1 § 6.1.6] */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_occlusion_query2/api.c b/tests/spec/arb_occlusion_query2/api.c index 4175a18b4..f4d46e39b 100644 --- a/tests/spec/arb_occlusion_query2/api.c +++ b/tests/spec/arb_occlusion_query2/api.c @@ -27,7 +27,7 @@ * Test miscellaneous other entrypoints for GL_ARB_occlusion_query2. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_occlusion_query2/render.c b/tests/spec/arb_occlusion_query2/render.c index 824e653c7..2d593fbfe 100644 --- a/tests/spec/arb_occlusion_query2/render.c +++ b/tests/spec/arb_occlusion_query2/render.c @@ -27,7 +27,7 @@ * Simple test for getting query results with GL_ARB_occlusion_query2. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_provoking_vertex/provoking-vertex-control.c b/tests/spec/arb_provoking_vertex/provoking-vertex-control.c index 302fdc4f4..5240afc74 100644 --- a/tests/spec/arb_provoking_vertex/provoking-vertex-control.c +++ b/tests/spec/arb_provoking_vertex/provoking-vertex-control.c @@ -32,7 +32,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_provoking_vertex/provoking-vertex-initial.c b/tests/spec/arb_provoking_vertex/provoking-vertex-initial.c index 1bd30aa32..576ff08e0 100644 --- a/tests/spec/arb_provoking_vertex/provoking-vertex-initial.c +++ b/tests/spec/arb_provoking_vertex/provoking-vertex-initial.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/spec/arb_provoking_vertex/quads-follow-provoking-vertex.c b/tests/spec/arb_provoking_vertex/quads-follow-provoking-vertex.c index 81a2855b5..02e03eeca 100644 --- a/tests/spec/arb_provoking_vertex/quads-follow-provoking-vertex.c +++ b/tests/spec/arb_provoking_vertex/quads-follow-provoking-vertex.c @@ -32,7 +32,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_provoking_vertex/xfb-before-flatshading.c b/tests/spec/arb_provoking_vertex/xfb-before-flatshading.c index 6d168ea48..41967d7c2 100644 --- a/tests/spec/arb_provoking_vertex/xfb-before-flatshading.c +++ b/tests/spec/arb_provoking_vertex/xfb-before-flatshading.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/spec/arb_robustness/client-mem-bounds.c b/tests/spec/arb_robustness/client-mem-bounds.c index 930944f31..cbc0923e7 100644 --- a/tests/spec/arb_robustness/client-mem-bounds.c +++ b/tests/spec/arb_robustness/client-mem-bounds.c @@ -21,7 +21,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_robustness/draw-vbo-bounds.c b/tests/spec/arb_robustness/draw-vbo-bounds.c index e9a05465c..8d2c83964 100644 --- a/tests/spec/arb_robustness/draw-vbo-bounds.c +++ b/tests/spec/arb_robustness/draw-vbo-bounds.c @@ -45,7 +45,7 @@ * - provide a command line option to actually enable ARB_robustness */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sample_shading/execution/api.c b/tests/spec/arb_sample_shading/execution/api.c index 4b2b2e8f1..ccff753bb 100644 --- a/tests/spec/arb_sample_shading/execution/api.c +++ b/tests/spec/arb_sample_shading/execution/api.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/spec/arb_sample_shading/execution/ignore-centroid-qualifier.cpp b/tests/spec/arb_sample_shading/execution/ignore-centroid-qualifier.cpp index cdcd9a0fe..17fb9b4f1 100644 --- a/tests/spec/arb_sample_shading/execution/ignore-centroid-qualifier.cpp +++ b/tests/spec/arb_sample_shading/execution/ignore-centroid-qualifier.cpp @@ -29,7 +29,7 @@ * used with 'in' variable. * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-fbo.h" using namespace piglit_util_fbo; diff --git a/tests/spec/arb_sample_shading/execution/interpolate-at-sample-position.cpp b/tests/spec/arb_sample_shading/execution/interpolate-at-sample-position.cpp index 253606b4a..299696160 100644 --- a/tests/spec/arb_sample_shading/execution/interpolate-at-sample-position.cpp +++ b/tests/spec/arb_sample_shading/execution/interpolate-at-sample-position.cpp @@ -28,7 +28,7 @@ * positions when using per sample shading. * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-fbo.h" using namespace piglit_util_fbo; diff --git a/tests/spec/arb_sampler_objects/framebufferblit.c b/tests/spec/arb_sampler_objects/framebufferblit.c index f8dd51b2e..10e3625fb 100644 --- a/tests/spec/arb_sampler_objects/framebufferblit.c +++ b/tests/spec/arb_sampler_objects/framebufferblit.c @@ -34,7 +34,7 @@ * the neighbors of that pixel get filtered in. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sampler_objects/sampler-incomplete.c b/tests/spec/arb_sampler_objects/sampler-incomplete.c index 7ac930e11..d357c2bab 100644 --- a/tests/spec/arb_sampler_objects/sampler-incomplete.c +++ b/tests/spec/arb_sampler_objects/sampler-incomplete.c @@ -33,7 +33,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sampler_objects/sampler-objects.c b/tests/spec/arb_sampler_objects/sampler-objects.c index 62c826974..b07f04bc5 100644 --- a/tests/spec/arb_sampler_objects/sampler-objects.c +++ b/tests/spec/arb_sampler_objects/sampler-objects.c @@ -30,7 +30,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sampler_objects/srgb-decode.c b/tests/spec/arb_sampler_objects/srgb-decode.c index aebd3a38f..c05816278 100644 --- a/tests/spec/arb_sampler_objects/srgb-decode.c +++ b/tests/spec/arb_sampler_objects/srgb-decode.c @@ -39,7 +39,7 @@ * sampler." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c index 5554e69de..aea6975ee 100644 --- a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c +++ b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_seamless_cube_map/initially-disabled.c b/tests/spec/arb_seamless_cube_map/initially-disabled.c index b2cd74fb4..37ff010fd 100644 --- a/tests/spec/arb_seamless_cube_map/initially-disabled.c +++ b/tests/spec/arb_seamless_cube_map/initially-disabled.c @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/spec/arb_seamless_cube_map/three-faces-average.c b/tests/spec/arb_seamless_cube_map/three-faces-average.c index d15170ff0..b4c794f2b 100644 --- a/tests/spec/arb_seamless_cube_map/three-faces-average.c +++ b/tests/spec/arb_seamless_cube_map/three-faces-average.c @@ -41,7 +41,7 @@ * that value." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_separate_shader_objects/400-combinations.c b/tests/spec/arb_separate_shader_objects/400-combinations.c index 388536f1b..fafeed109 100644 --- a/tests/spec/arb_separate_shader_objects/400-combinations.c +++ b/tests/spec/arb_separate_shader_objects/400-combinations.c @@ -39,7 +39,7 @@ * test can use either rendezvous-by-name (default) or rendezvous-by-location * (with --by-location command line parameter). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * Size of each square that will be drawn. diff --git a/tests/spec/arb_separate_shader_objects/ActiveShaderProgram-invalid-program.c b/tests/spec/arb_separate_shader_objects/ActiveShaderProgram-invalid-program.c index 5f8b696c9..f9928f85f 100644 --- a/tests/spec/arb_separate_shader_objects/ActiveShaderProgram-invalid-program.c +++ b/tests/spec/arb_separate_shader_objects/ActiveShaderProgram-invalid-program.c @@ -39,7 +39,7 @@ * the active program state has not been modified. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_separate_shader_objects/GetProgramPipelineiv.c b/tests/spec/arb_separate_shader_objects/GetProgramPipelineiv.c index 45e9ffc89..f8c79bed1 100644 --- a/tests/spec/arb_separate_shader_objects/GetProgramPipelineiv.c +++ b/tests/spec/arb_separate_shader_objects/GetProgramPipelineiv.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/spec/arb_separate_shader_objects/IsProgramPipeline.c b/tests/spec/arb_separate_shader_objects/IsProgramPipeline.c index fe56c07cf..33f9a6ee4 100644 --- a/tests/spec/arb_separate_shader_objects/IsProgramPipeline.c +++ b/tests/spec/arb_separate_shader_objects/IsProgramPipeline.c @@ -41,7 +41,7 @@ * first bound." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_separate_shader_objects/ProgramUniform-coverage.c b/tests/spec/arb_separate_shader_objects/ProgramUniform-coverage.c index 024baf3e3..81d370c88 100644 --- a/tests/spec/arb_separate_shader_objects/ProgramUniform-coverage.c +++ b/tests/spec/arb_separate_shader_objects/ProgramUniform-coverage.c @@ -40,7 +40,7 @@ * - Transpose matrices set by \c glProgramUniformMatrix*v with \c transpose * set to \c GL_TRUE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_separate_shader_objects/UseProgramStages-non-separable.c b/tests/spec/arb_separate_shader_objects/UseProgramStages-non-separable.c index 7ddd9117c..39d06b8b4 100644 --- a/tests/spec/arb_separate_shader_objects/UseProgramStages-non-separable.c +++ b/tests/spec/arb_separate_shader_objects/UseProgramStages-non-separable.c @@ -25,7 +25,7 @@ * \file UseProgramStages-non-separable.c * Verify that a program w/o PROGRAM_SEPARABLE cannot be used with SSO */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c b/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c index f8e542c4f..a35ed7ef7 100644 --- a/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.c +++ b/tests/spec/arb_separate_shader_objects/ValidateProgramPipeline.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/spec/arb_separate_shader_objects/active-sampler-conflict.c b/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c index 8cfb74baf..e4c6800b8 100644 --- a/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c +++ b/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c @@ -57,7 +57,7 @@ * implementations that latch state in glValidateProgramPipeline and do not * re-validate in glDrawArrays. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_separate_shader_objects/rendezvous_by_location.c b/tests/spec/arb_separate_shader_objects/rendezvous_by_location.c index 4193ea56c..ae86abf31 100644 --- a/tests/spec/arb_separate_shader_objects/rendezvous_by_location.c +++ b/tests/spec/arb_separate_shader_objects/rendezvous_by_location.c @@ -41,7 +41,7 @@ * However, the assigned locations are the same as in the other fragment * shader. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_shader_atomic_counters/common.h b/tests/spec/arb_shader_atomic_counters/common.h index f9772daf9..5611f8ec8 100644 --- a/tests/spec/arb_shader_atomic_counters/common.h +++ b/tests/spec/arb_shader_atomic_counters/common.h @@ -29,7 +29,7 @@ #ifndef __PIGLIT_ARB_SHADER_ATOMIC_COUNTERS_COMMON_H__ #define __PIGLIT_ARB_SHADER_ATOMIC_COUNTERS_COMMON_H__ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" bool atomic_counters_probe_buffer(unsigned base, unsigned count, diff --git a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c index 8d3d232a3..937a37c26 100644 --- a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c +++ b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c @@ -31,7 +31,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_shader_objects/clear-with-deleted.c b/tests/spec/arb_shader_objects/clear-with-deleted.c index fc27023e5..0b8875370 100644 --- a/tests/spec/arb_shader_objects/clear-with-deleted.c +++ b/tests/spec/arb_shader_objects/clear-with-deleted.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file clear-with-deleted.c diff --git a/tests/spec/arb_shader_objects/delete-repeat.c b/tests/spec/arb_shader_objects/delete-repeat.c index c37099eb4..a72c35363 100644 --- a/tests/spec/arb_shader_objects/delete-repeat.c +++ b/tests/spec/arb_shader_objects/delete-repeat.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file delete-repeat.c diff --git a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c index a8cc7a0db..7390b991d 100644 --- a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c +++ b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file getactiveuniform-beginend.c diff --git a/tests/spec/arb_shader_objects/getuniform.c b/tests/spec/arb_shader_objects/getuniform.c index b73af8e03..d2a7d23f3 100644 --- a/tests/spec/arb_shader_objects/getuniform.c +++ b/tests/spec/arb_shader_objects/getuniform.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file getuniform.c diff --git a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c index ccc073f1a..e3e5cc552 100644 --- a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c +++ b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c @@ -29,7 +29,7 @@ * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_shader_texture_lod/execution/texgrad.c b/tests/spec/arb_shader_texture_lod/execution/texgrad.c index 66085e22e..ec09eda32 100644 --- a/tests/spec/arb_shader_texture_lod/execution/texgrad.c +++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c @@ -29,7 +29,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_shader_texture_lod/execution/texgradcube.c b/tests/spec/arb_shader_texture_lod/execution/texgradcube.c index 5cb7a4788..aeaab4872 100644 --- a/tests/spec/arb_shader_texture_lod/execution/texgradcube.c +++ b/tests/spec/arb_shader_texture_lod/execution/texgradcube.c @@ -28,7 +28,7 @@ * Marek Olšák <maraeo@gmail.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_shading_language_420pack/execution/multiple-layout-qualifiers.c b/tests/spec/arb_shading_language_420pack/execution/multiple-layout-qualifiers.c index eae12bcc1..c58295f5f 100644 --- a/tests/spec/arb_shading_language_420pack/execution/multiple-layout-qualifiers.c +++ b/tests/spec/arb_shading_language_420pack/execution/multiple-layout-qualifiers.c @@ -36,7 +36,7 @@ * results in the qualification being row_major." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_stencil_texturing/draw.c b/tests/spec/arb_stencil_texturing/draw.c index 59c9e656a..184c10571 100644 --- a/tests/spec/arb_stencil_texturing/draw.c +++ b/tests/spec/arb_stencil_texturing/draw.c @@ -48,7 +48,7 @@ #define __STDC_FORMAT_MACROS #include <inttypes.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sync/ClientWaitSync-errors.c b/tests/spec/arb_sync/ClientWaitSync-errors.c index fab418f27..add5af340 100644 --- a/tests/spec/arb_sync/ClientWaitSync-errors.c +++ b/tests/spec/arb_sync/ClientWaitSync-errors.c @@ -34,7 +34,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sync/DeleteSync.c b/tests/spec/arb_sync/DeleteSync.c index da5c04a96..02ad0c3d2 100644 --- a/tests/spec/arb_sync/DeleteSync.c +++ b/tests/spec/arb_sync/DeleteSync.c @@ -32,7 +32,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sync/FenceSync-errors.c b/tests/spec/arb_sync/FenceSync-errors.c index 63dc7b324..c7addc175 100644 --- a/tests/spec/arb_sync/FenceSync-errors.c +++ b/tests/spec/arb_sync/FenceSync-errors.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/spec/arb_sync/GetSynciv-errors.c b/tests/spec/arb_sync/GetSynciv-errors.c index d58b459e9..c75c08628 100644 --- a/tests/spec/arb_sync/GetSynciv-errors.c +++ b/tests/spec/arb_sync/GetSynciv-errors.c @@ -32,7 +32,7 @@ * INVALID_ENUM error is generated." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sync/IsSync.c b/tests/spec/arb_sync/IsSync.c index 66c89181c..fa8eb61c9 100644 --- a/tests/spec/arb_sync/IsSync.c +++ b/tests/spec/arb_sync/IsSync.c @@ -34,7 +34,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sync/WaitSync-errors.c b/tests/spec/arb_sync/WaitSync-errors.c index 41a696707..b5bbb2c19 100644 --- a/tests/spec/arb_sync/WaitSync-errors.c +++ b/tests/spec/arb_sync/WaitSync-errors.c @@ -32,7 +32,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sync/repeat-wait.c b/tests/spec/arb_sync/repeat-wait.c index 0c2be9c42..ac653bbc6 100644 --- a/tests/spec/arb_sync/repeat-wait.c +++ b/tests/spec/arb_sync/repeat-wait.c @@ -41,7 +41,7 @@ * driver on a later ClientWaitSync. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sync/sync-initialize.c b/tests/spec/arb_sync/sync-initialize.c index 6c7283d06..65646bb5e 100644 --- a/tests/spec/arb_sync/sync-initialize.c +++ b/tests/spec/arb_sync/sync-initialize.c @@ -37,7 +37,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_sync/timeout-zero.c b/tests/spec/arb_sync/timeout-zero.c index 05ad01b8d..27259573b 100644 --- a/tests/spec/arb_sync/timeout-zero.c +++ b/tests/spec/arb_sync/timeout-zero.c @@ -36,7 +36,7 @@ * performed." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_tessellation_shader/get-tcs-params.c b/tests/spec/arb_tessellation_shader/get-tcs-params.c index 45c685b6c..0f98b89fb 100644 --- a/tests/spec/arb_tessellation_shader/get-tcs-params.c +++ b/tests/spec/arb_tessellation_shader/get-tcs-params.c @@ -27,7 +27,7 @@ * Test tessellation control shader layout getters. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_tessellation_shader/get-tes-params.c b/tests/spec/arb_tessellation_shader/get-tes-params.c index d4fa4167a..77bea0b4e 100644 --- a/tests/spec/arb_tessellation_shader/get-tes-params.c +++ b/tests/spec/arb_tessellation_shader/get-tes-params.c @@ -27,7 +27,7 @@ * Test tessellation evaluation shader layout getters. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_tessellation_shader/invalid-get-program-params.c b/tests/spec/arb_tessellation_shader/invalid-get-program-params.c index c54622929..59f8db638 100644 --- a/tests/spec/arb_tessellation_shader/invalid-get-program-params.c +++ b/tests/spec/arb_tessellation_shader/invalid-get-program-params.c @@ -34,7 +34,7 @@ * Test to get parameters from programs that lack the required shader type. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_tessellation_shader/invalid-patch-vertices-range.c b/tests/spec/arb_tessellation_shader/invalid-patch-vertices-range.c index c1c7a760d..ffd8b707f 100644 --- a/tests/spec/arb_tessellation_shader/invalid-patch-vertices-range.c +++ b/tests/spec/arb_tessellation_shader/invalid-patch-vertices-range.c @@ -32,7 +32,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_tessellation_shader/invalid-primitive.c b/tests/spec/arb_tessellation_shader/invalid-primitive.c index cf45301ca..83944390e 100644 --- a/tests/spec/arb_tessellation_shader/invalid-primitive.c +++ b/tests/spec/arb_tessellation_shader/invalid-primitive.c @@ -41,7 +41,7 @@ * Test for all those errors except without active program. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_buffer_object/data-sync.c b/tests/spec/arb_texture_buffer_object/data-sync.c index 9703ec66d..5542734fc 100644 --- a/tests/spec/arb_texture_buffer_object/data-sync.c +++ b/tests/spec/arb_texture_buffer_object/data-sync.c @@ -28,7 +28,7 @@ * Caught a bug in the i965 driver after a core Mesa refactor. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/spec/arb_texture_buffer_object/dlist.c b/tests/spec/arb_texture_buffer_object/dlist.c index f1674c057..ea15f6171 100644 --- a/tests/spec/arb_texture_buffer_object/dlist.c +++ b/tests/spec/arb_texture_buffer_object/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file dlist.c diff --git a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c index 8ca98e65d..c9aa6c4d7 100644 --- a/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c +++ b/tests/spec/arb_texture_buffer_object/fetch-outside-bounds.c @@ -37,7 +37,7 @@ * but don't test the values returned. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_buffer_object/formats.c b/tests/spec/arb_texture_buffer_object/formats.c index ccd818d00..81f494e9e 100644 --- a/tests/spec/arb_texture_buffer_object/formats.c +++ b/tests/spec/arb_texture_buffer_object/formats.c @@ -25,7 +25,7 @@ * Test for the minimum maximum value in the GL_ARB_texture_buffer_object spec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" enum channels { A, diff --git a/tests/spec/arb_texture_buffer_object/get.c b/tests/spec/arb_texture_buffer_object/get.c index d96a3c1f4..68d492dca 100644 --- a/tests/spec/arb_texture_buffer_object/get.c +++ b/tests/spec/arb_texture_buffer_object/get.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file get.c diff --git a/tests/spec/arb_texture_buffer_object/minmax.c b/tests/spec/arb_texture_buffer_object/minmax.c index 7a7625ff1..98b80d60e 100644 --- a/tests/spec/arb_texture_buffer_object/minmax.c +++ b/tests/spec/arb_texture_buffer_object/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum value in the GL_ARB_texture_buffer_object spec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c index 43613bd00..a5f470f3d 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c @@ -28,7 +28,7 @@ * buffer object, the error INVALID_OPERATION is generated." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-format.c b/tests/spec/arb_texture_buffer_object/negative-bad-format.c index df779c97a..60b7b082b 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-format.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-format.c @@ -28,7 +28,7 @@ * of the sized internal formats found in Table X.1." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-target.c b/tests/spec/arb_texture_buffer_object/negative-bad-target.c index b814f7275..25f626b3d 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-target.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-target.c @@ -27,7 +27,7 @@ * "<target> must be TEXTURE_BUFFER_ARB" */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_buffer_object/negative-unsupported.c b/tests/spec/arb_texture_buffer_object/negative-unsupported.c index d465c972c..b71a62e69 100644 --- a/tests/spec/arb_texture_buffer_object/negative-unsupported.c +++ b/tests/spec/arb_texture_buffer_object/negative-unsupported.c @@ -25,7 +25,7 @@ * extension is not supported. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_buffer_object/render-no-bo.c b/tests/spec/arb_texture_buffer_object/render-no-bo.c index f64e571c5..92e8f3ed8 100644 --- a/tests/spec/arb_texture_buffer_object/render-no-bo.c +++ b/tests/spec/arb_texture_buffer_object/render-no-bo.c @@ -35,7 +35,7 @@ * but don't test the values returned. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" enum piglit_result piglit_display(void) diff --git a/tests/spec/arb_texture_buffer_object/subdata-sync.c b/tests/spec/arb_texture_buffer_object/subdata-sync.c index 2644b001c..8b1592b0b 100644 --- a/tests/spec/arb_texture_buffer_object/subdata-sync.c +++ b/tests/spec/arb_texture_buffer_object/subdata-sync.c @@ -26,7 +26,7 @@ * Tests that glBufferSubData() synchronizes correctly with TBO rendering. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/spec/arb_texture_buffer_object/unused-name.c b/tests/spec/arb_texture_buffer_object/unused-name.c index 84ae5f1d5..b1f5166a6 100644 --- a/tests/spec/arb_texture_buffer_object/unused-name.c +++ b/tests/spec/arb_texture_buffer_object/unused-name.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file unused-name.c diff --git a/tests/spec/arb_texture_buffer_range/dlist.c b/tests/spec/arb_texture_buffer_range/dlist.c index 4c5e53fdd..8c1f8cd13 100644 --- a/tests/spec/arb_texture_buffer_range/dlist.c +++ b/tests/spec/arb_texture_buffer_range/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file dlist.c diff --git a/tests/spec/arb_texture_buffer_range/errors.c b/tests/spec/arb_texture_buffer_range/errors.c index f6ddaaddd..6c6a32cb6 100644 --- a/tests/spec/arb_texture_buffer_range/errors.c +++ b/tests/spec/arb_texture_buffer_range/errors.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file errors.c diff --git a/tests/spec/arb_texture_buffer_range/ranges.c b/tests/spec/arb_texture_buffer_range/ranges.c index 0dfa88350..92f641ea1 100644 --- a/tests/spec/arb_texture_buffer_range/ranges.c +++ b/tests/spec/arb_texture_buffer_range/ranges.c @@ -25,7 +25,7 @@ * Test drawing with various ranges and sizes for glTexBufferRange. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_compression/internal-format-query.c b/tests/spec/arb_texture_compression/internal-format-query.c index f6b2af2b1..e9f62dfe3 100644 --- a/tests/spec/arb_texture_compression/internal-format-query.c +++ b/tests/spec/arb_texture_compression/internal-format-query.c @@ -68,7 +68,7 @@ * and the texture image will not be compressed by the GL." */ #include <stdarg.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_compression/invalid-formats.c b/tests/spec/arb_texture_compression/invalid-formats.c index 310ed75e0..e67f00ee8 100644 --- a/tests/spec/arb_texture_compression/invalid-formats.c +++ b/tests/spec/arb_texture_compression/invalid-formats.c @@ -37,7 +37,7 @@ * All texture compression extensions have taken this to mean only linear RGB * and linear RGBA formats should be exposed. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_cube_map_array/cubemap-lod.c b/tests/spec/arb_texture_cube_map_array/cubemap-lod.c index d452f09dd..1f5eaf8db 100644 --- a/tests/spec/arb_texture_cube_map_array/cubemap-lod.c +++ b/tests/spec/arb_texture_cube_map_array/cubemap-lod.c @@ -34,7 +34,7 @@ * of rendering. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define PAD 5 diff --git a/tests/spec/arb_texture_cube_map_array/cubemap.c b/tests/spec/arb_texture_cube_map_array/cubemap.c index b1c5bb434..95f12204d 100644 --- a/tests/spec/arb_texture_cube_map_array/cubemap.c +++ b/tests/spec/arb_texture_cube_map_array/cubemap.c @@ -33,7 +33,7 @@ * results. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define PAD 5 diff --git a/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c b/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c index d7996c323..980eadf44 100644 --- a/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c +++ b/tests/spec/arb_texture_cube_map_array/fbo-cubemap-array.c @@ -34,7 +34,7 @@ * based on fbo-array.c */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 32 #define BUF_HEIGHT 32 diff --git a/tests/spec/arb_texture_cube_map_array/get.c b/tests/spec/arb_texture_cube_map_array/get.c index fc08f0c3a..8669e6c67 100644 --- a/tests/spec/arb_texture_cube_map_array/get.c +++ b/tests/spec/arb_texture_cube_map_array/get.c @@ -28,7 +28,7 @@ * should return bound texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c b/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c index 59a00cadc..70c74d087 100644 --- a/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c +++ b/tests/spec/arb_texture_cube_map_array/sampler-cube-array-shadow.c @@ -31,7 +31,7 @@ * map array interfaces. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c b/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c index 8feb48bdb..19d821b7c 100644 --- a/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c +++ b/tests/spec/arb_texture_cube_map_array/teximage3d-invalid-values.c @@ -30,7 +30,7 @@ * TEXTURE_CUBE_MAP_ARRAY_ARB and <width> and <height> are not equal. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_float/texture-float-formats.c b/tests/spec/arb_texture_float/texture-float-formats.c index 0f7c767bb..88b3d3486 100644 --- a/tests/spec/arb_texture_float/texture-float-formats.c +++ b/tests/spec/arb_texture_float/texture-float-formats.c @@ -26,7 +26,7 @@ * Tests GL_ARB_texture_float floating point formats */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/errors.c b/tests/spec/arb_texture_multisample/errors.c index 5edfcd676..0c16f4ec8 100644 --- a/tests/spec/arb_texture_multisample/errors.c +++ b/tests/spec/arb_texture_multisample/errors.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/fb-completeness.c b/tests/spec/arb_texture_multisample/fb-completeness.c index 676ac6174..302b43da2 100644 --- a/tests/spec/arb_texture_multisample/fb-completeness.c +++ b/tests/spec/arb_texture_multisample/fb-completeness.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/minmax.c b/tests/spec/arb_texture_multisample/minmax.c index 488c55ccf..4177edc1a 100644 --- a/tests/spec/arb_texture_multisample/minmax.c +++ b/tests/spec/arb_texture_multisample/minmax.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/negative-max-samples.c b/tests/spec/arb_texture_multisample/negative-max-samples.c index 38a30eb8e..1f9a3cedc 100644 --- a/tests/spec/arb_texture_multisample/negative-max-samples.c +++ b/tests/spec/arb_texture_multisample/negative-max-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file negative-max-samples.c diff --git a/tests/spec/arb_texture_multisample/sample-mask-execution.c b/tests/spec/arb_texture_multisample/sample-mask-execution.c index 7d2da4414..526b9e3c1 100644 --- a/tests/spec/arb_texture_multisample/sample-mask-execution.c +++ b/tests/spec/arb_texture_multisample/sample-mask-execution.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/sample-mask-value.c b/tests/spec/arb_texture_multisample/sample-mask-value.c index 35f308662..eefa48bf1 100644 --- a/tests/spec/arb_texture_multisample/sample-mask-value.c +++ b/tests/spec/arb_texture_multisample/sample-mask-value.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/sample-mask.c b/tests/spec/arb_texture_multisample/sample-mask.c index 0ea4c6326..5c63682e8 100644 --- a/tests/spec/arb_texture_multisample/sample-mask.c +++ b/tests/spec/arb_texture_multisample/sample-mask.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/sample-position.c b/tests/spec/arb_texture_multisample/sample-position.c index d9119d7b2..a5f4b3a65 100644 --- a/tests/spec/arb_texture_multisample/sample-position.c +++ b/tests/spec/arb_texture_multisample/sample-position.c @@ -22,7 +22,7 @@ * * Authors: Christoph Bumiller */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /* File: sample-position.c * diff --git a/tests/spec/arb_texture_multisample/texelfetch.c b/tests/spec/arb_texture_multisample/texelfetch.c index a7235ce3c..96723a97a 100644 --- a/tests/spec/arb_texture_multisample/texelfetch.c +++ b/tests/spec/arb_texture_multisample/texelfetch.c @@ -35,7 +35,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/teximage-2d-multisample.c b/tests/spec/arb_texture_multisample/teximage-2d-multisample.c index e0ec19e5c..0e9c8773f 100644 --- a/tests/spec/arb_texture_multisample/teximage-2d-multisample.c +++ b/tests/spec/arb_texture_multisample/teximage-2d-multisample.c @@ -30,7 +30,7 @@ * PROXY_TEXTURE_2D_MULTISAMPLE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/teximage-3d-multisample.c b/tests/spec/arb_texture_multisample/teximage-3d-multisample.c index 639a79b14..dcbbbf441 100644 --- a/tests/spec/arb_texture_multisample/teximage-3d-multisample.c +++ b/tests/spec/arb_texture_multisample/teximage-3d-multisample.c @@ -30,7 +30,7 @@ * or PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_multisample/texstate.c b/tests/spec/arb_texture_multisample/texstate.c index 1484a3e2f..3d9fd260f 100644 --- a/tests/spec/arb_texture_multisample/texstate.c +++ b/tests/spec/arb_texture_multisample/texstate.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_rectangle/texrect-simple.c b/tests/spec/arb_texture_rectangle/texrect-simple.c index 6435c2ed5..ac19cb994 100644 --- a/tests/spec/arb_texture_rectangle/texrect-simple.c +++ b/tests/spec/arb_texture_rectangle/texrect-simple.c @@ -31,7 +31,7 @@ * \author: Eric Anholt <eric@anholt.net> (original) * \author: Tom Gall <tom.gall@linaro.org> (port) */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEXTURE_WIDTH 255 #define TEXTURE_HEIGHT 127 diff --git a/tests/spec/arb_texture_rectangle/texture-base-level-error.c b/tests/spec/arb_texture_rectangle/texture-base-level-error.c index 800251f38..7a20f93db 100644 --- a/tests/spec/arb_texture_rectangle/texture-base-level-error.c +++ b/tests/spec/arb_texture_rectangle/texture-base-level-error.c @@ -58,7 +58,7 @@ * GL_INVALID_ENUM anyway! */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_storage/texture-storage.c b/tests/spec/arb_texture_storage/texture-storage.c index 84dc7a452..e0006a6da 100644 --- a/tests/spec/arb_texture_storage/texture-storage.c +++ b/tests/spec/arb_texture_storage/texture-storage.c @@ -28,7 +28,7 @@ * Brian Paul */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_storage_multisample/tex-param.c b/tests/spec/arb_texture_storage_multisample/tex-param.c index 55864f5d3..06f17830f 100644 --- a/tests/spec/arb_texture_storage_multisample/tex-param.c +++ b/tests/spec/arb_texture_storage_multisample/tex-param.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_storage_multisample/tex-storage.c b/tests/spec/arb_texture_storage_multisample/tex-storage.c index c3e937d8c..4fbecd799 100644 --- a/tests/spec/arb_texture_storage_multisample/tex-storage.c +++ b/tests/spec/arb_texture_storage_multisample/tex-storage.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/clear-into-view-2d-array.c b/tests/spec/arb_texture_view/clear-into-view-2d-array.c index ca45bbe8d..7f3a5bf36 100644 --- a/tests/spec/arb_texture_view/clear-into-view-2d-array.c +++ b/tests/spec/arb_texture_view/clear-into-view-2d-array.c @@ -29,7 +29,7 @@ * works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/clear-into-view-2d.c b/tests/spec/arb_texture_view/clear-into-view-2d.c index 502de2b22..b211386f7 100644 --- a/tests/spec/arb_texture_view/clear-into-view-2d.c +++ b/tests/spec/arb_texture_view/clear-into-view-2d.c @@ -29,7 +29,7 @@ * of a 2D texture array works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/clear-into-view-layered.c b/tests/spec/arb_texture_view/clear-into-view-layered.c index c1ef7d92e..d6405f221 100644 --- a/tests/spec/arb_texture_view/clear-into-view-layered.c +++ b/tests/spec/arb_texture_view/clear-into-view-layered.c @@ -29,7 +29,7 @@ * works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/common.c b/tests/spec/arb_texture_view/common.c index 9ee75d21c..dedb41155 100644 --- a/tests/spec/arb_texture_view/common.c +++ b/tests/spec/arb_texture_view/common.c @@ -23,7 +23,7 @@ * Author: Jon Ashburn <jon@lunarg.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <stdarg.h> const GLubyte Colors[][8] = { diff --git a/tests/spec/arb_texture_view/common.h b/tests/spec/arb_texture_view/common.h index e6e517e66..fcf1934b1 100644 --- a/tests/spec/arb_texture_view/common.h +++ b/tests/spec/arb_texture_view/common.h @@ -23,7 +23,7 @@ * Author: Jon Ashburn <jon@lunarg.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" GLubyte * create_solid_image(GLint w, GLint h, GLint d, const unsigned int bytes, diff --git a/tests/spec/arb_texture_view/copytexsubimage-layers.c b/tests/spec/arb_texture_view/copytexsubimage-layers.c index 4e8d61396..19f8b28f8 100644 --- a/tests/spec/arb_texture_view/copytexsubimage-layers.c +++ b/tests/spec/arb_texture_view/copytexsubimage-layers.c @@ -29,7 +29,7 @@ * of a 2D texture array works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/formats.c b/tests/spec/arb_texture_view/formats.c index 78d086926..c905fe2ab 100644 --- a/tests/spec/arb_texture_view/formats.c +++ b/tests/spec/arb_texture_view/formats.c @@ -35,7 +35,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/getteximage-srgb.c b/tests/spec/arb_texture_view/getteximage-srgb.c index 9086a42b8..d41959c26 100644 --- a/tests/spec/arb_texture_view/getteximage-srgb.c +++ b/tests/spec/arb_texture_view/getteximage-srgb.c @@ -29,7 +29,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; diff --git a/tests/spec/arb_texture_view/lifetime_format.c b/tests/spec/arb_texture_view/lifetime_format.c index 2b91a3f21..2879c034c 100644 --- a/tests/spec/arb_texture_view/lifetime_format.c +++ b/tests/spec/arb_texture_view/lifetime_format.c @@ -29,7 +29,7 @@ * check results via glGetTexImage(). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/params.c b/tests/spec/arb_texture_view/params.c index 8869a44bc..144c247d8 100644 --- a/tests/spec/arb_texture_view/params.c +++ b/tests/spec/arb_texture_view/params.c @@ -35,7 +35,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/queries.c b/tests/spec/arb_texture_view/queries.c index 368b8c51c..8d4eb949e 100644 --- a/tests/spec/arb_texture_view/queries.c +++ b/tests/spec/arb_texture_view/queries.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/spec/arb_texture_view/rendering-formats.c b/tests/spec/arb_texture_view/rendering-formats.c index 243f60d74..40df40c5f 100644 --- a/tests/spec/arb_texture_view/rendering-formats.c +++ b/tests/spec/arb_texture_view/rendering-formats.c @@ -29,7 +29,7 @@ * internalformat to the original texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/rendering_layers.c b/tests/spec/arb_texture_view/rendering_layers.c index 897de8e67..4a7f3c22c 100644 --- a/tests/spec/arb_texture_view/rendering_layers.c +++ b/tests/spec/arb_texture_view/rendering_layers.c @@ -29,7 +29,7 @@ * reads the framebuffer to ensure the rendered color is correct. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/rendering_levels.c b/tests/spec/arb_texture_view/rendering_levels.c index 556058437..51f5366d2 100644 --- a/tests/spec/arb_texture_view/rendering_levels.c +++ b/tests/spec/arb_texture_view/rendering_levels.c @@ -29,7 +29,7 @@ * reads the framebuffer to ensure the rendered color is correct. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/rendering_target.c b/tests/spec/arb_texture_view/rendering_target.c index 20eb2910e..1ef5cc771 100644 --- a/tests/spec/arb_texture_view/rendering_target.c +++ b/tests/spec/arb_texture_view/rendering_target.c @@ -29,7 +29,7 @@ * reads the framebuffer to ensure the rendered color is correct. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/targets.c b/tests/spec/arb_texture_view/targets.c index 9dd0858ee..bbaa7366e 100644 --- a/tests/spec/arb_texture_view/targets.c +++ b/tests/spec/arb_texture_view/targets.c @@ -34,7 +34,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/texsubimage-layers.c b/tests/spec/arb_texture_view/texsubimage-layers.c index 512db0b31..c2b250b2f 100644 --- a/tests/spec/arb_texture_view/texsubimage-layers.c +++ b/tests/spec/arb_texture_view/texsubimage-layers.c @@ -29,7 +29,7 @@ * has a nonzero MinLayer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/texsubimage-levels.c b/tests/spec/arb_texture_view/texsubimage-levels.c index 983beb0f5..85986cad2 100644 --- a/tests/spec/arb_texture_view/texsubimage-levels.c +++ b/tests/spec/arb_texture_view/texsubimage-levels.c @@ -30,7 +30,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "common.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_texture_view/texture-immutable-levels.c b/tests/spec/arb_texture_view/texture-immutable-levels.c index 946ff209f..a90a2cd0d 100644 --- a/tests/spec/arb_texture_view/texture-immutable-levels.c +++ b/tests/spec/arb_texture_view/texture-immutable-levels.c @@ -36,7 +36,7 @@ * correctly set to <levels>. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_timer_query/timestamp-get.c b/tests/spec/arb_timer_query/timestamp-get.c index 433a58da5..608145f1a 100644 --- a/tests/spec/arb_timer_query/timestamp-get.c +++ b/tests/spec/arb_timer_query/timestamp-get.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <unistd.h> #include <sys/time.h> diff --git a/tests/spec/arb_transform_feedback2/api-queries.c b/tests/spec/arb_transform_feedback2/api-queries.c index 038d8bdd9..61be114b6 100644 --- a/tests/spec/arb_transform_feedback2/api-queries.c +++ b/tests/spec/arb_transform_feedback2/api-queries.c @@ -28,7 +28,7 @@ * None of these subtests is large enough to warrant a separate test case. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c b/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c index 34e40efa6..c4ef636b0 100644 --- a/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c +++ b/tests/spec/arb_transform_feedback2/cannot-bind-when-active.c @@ -32,7 +32,7 @@ * described below)." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_transform_feedback2/change-objects-while-paused.c b/tests/spec/arb_transform_feedback2/change-objects-while-paused.c index 2d759de31..448ec7359 100644 --- a/tests/spec/arb_transform_feedback2/change-objects-while-paused.c +++ b/tests/spec/arb_transform_feedback2/change-objects-while-paused.c @@ -38,7 +38,7 @@ * - Verify that all the expected data has landed in the expected places. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_transform_feedback2/draw-auto.c b/tests/spec/arb_transform_feedback2/draw-auto.c index dd615f579..801abdec7 100644 --- a/tests/spec/arb_transform_feedback2/draw-auto.c +++ b/tests/spec/arb_transform_feedback2/draw-auto.c @@ -27,7 +27,7 @@ * Test Pause, Resume, and DrawTF. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_transform_feedback2/gen-names-only.c b/tests/spec/arb_transform_feedback2/gen-names-only.c index 5292911dc..cacac8ea8 100644 --- a/tests/spec/arb_transform_feedback2/gen-names-only.c +++ b/tests/spec/arb_transform_feedback2/gen-names-only.c @@ -32,7 +32,7 @@ * deleted with DeleteTransformFeedbacks." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_transform_feedback2/istransformfeedback.c b/tests/spec/arb_transform_feedback2/istransformfeedback.c index 5c27a4e9e..cb4d670f8 100644 --- a/tests/spec/arb_transform_feedback2/istransformfeedback.c +++ b/tests/spec/arb_transform_feedback2/istransformfeedback.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file istransformfeedback.c diff --git a/tests/spec/arb_transform_feedback2/pause-counting.c b/tests/spec/arb_transform_feedback2/pause-counting.c index c24bcca6d..9873ae3c1 100644 --- a/tests/spec/arb_transform_feedback2/pause-counting.c +++ b/tests/spec/arb_transform_feedback2/pause-counting.c @@ -26,7 +26,7 @@ * Verify behavior of XFB "counting" queries when pause and resume are used. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c index 3dbd43b79..1e396df1a 100644 --- a/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c +++ b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file bind_buffer_invalid_index.c diff --git a/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c index 825a91962..89f1e7889 100644 --- a/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c +++ b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "xfb3_common.h" /** diff --git a/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c index c36264b99..4d405944d 100644 --- a/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c +++ b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file query_with_invalid_index.c diff --git a/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c b/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c index 1d57693ab..06937eb50 100644 --- a/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c +++ b/tests/spec/arb_transform_feedback3/ext_interleaved_two_bufs.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "xfb3_common.h" /** diff --git a/tests/spec/arb_transform_feedback3/query_with_invalid_index.c b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c index 1279c8b36..21972207c 100644 --- a/tests/spec/arb_transform_feedback3/query_with_invalid_index.c +++ b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file query_with_invalid_index.c diff --git a/tests/spec/arb_transform_feedback3/set_invalid_varyings.c b/tests/spec/arb_transform_feedback3/set_invalid_varyings.c index 06362e5eb..2a7fc594a 100644 --- a/tests/spec/arb_transform_feedback3/set_invalid_varyings.c +++ b/tests/spec/arb_transform_feedback3/set_invalid_varyings.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "xfb3_common.h" /** diff --git a/tests/spec/arb_transform_feedback3/set_varyings_with_invalid_args.c b/tests/spec/arb_transform_feedback3/set_varyings_with_invalid_args.c index 2f42d4a2a..562477faf 100644 --- a/tests/spec/arb_transform_feedback3/set_varyings_with_invalid_args.c +++ b/tests/spec/arb_transform_feedback3/set_varyings_with_invalid_args.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "xfb3_common.h" /** diff --git a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c index 7bf2ec225..c9e81c274 100644 --- a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c +++ b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c @@ -27,7 +27,7 @@ * binding point. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/buffer-targets.c b/tests/spec/arb_uniform_buffer_object/buffer-targets.c index 18d975286..28924bc3c 100644 --- a/tests/spec/arb_uniform_buffer_object/buffer-targets.c +++ b/tests/spec/arb_uniform_buffer_object/buffer-targets.c @@ -35,7 +35,7 @@ * UNIFORM_BUFFER" */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/bufferstorage.c b/tests/spec/arb_uniform_buffer_object/bufferstorage.c index bcdd3858a..334fd4edd 100644 --- a/tests/spec/arb_uniform_buffer_object/bufferstorage.c +++ b/tests/spec/arb_uniform_buffer_object/bufferstorage.c @@ -29,7 +29,7 @@ * persistently mapped. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/deletebuffers.c b/tests/spec/arb_uniform_buffer_object/deletebuffers.c index 35be0f1aa..8dc249aa9 100644 --- a/tests/spec/arb_uniform_buffer_object/deletebuffers.c +++ b/tests/spec/arb_uniform_buffer_object/deletebuffers.c @@ -28,7 +28,7 @@ * usual glBindBuffer() binding. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/dlist.c b/tests/spec/arb_uniform_buffer_object/dlist.c index 476012f26..eb93d119c 100644 --- a/tests/spec/arb_uniform_buffer_object/dlist.c +++ b/tests/spec/arb_uniform_buffer_object/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file dlist.c diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformblockiv-uniform-block-data-size.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformblockiv-uniform-block-data-size.c index fed88a230..97edc400c 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformblockiv-uniform-block-data-size.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformblockiv-uniform-block-data-size.c @@ -34,7 +34,7 @@ * next multiple of the base alignment required for a vec4." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "uniform-types.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformblockname.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformblockname.c index 175ca79dc..a967ff278 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformblockname.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformblockname.c @@ -64,7 +64,7 @@ * equal to ACTIVE_UNIFORM_BLOCKS." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformname.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformname.c index a803d5936..955ca96c0 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformname.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformname.c @@ -64,7 +64,7 @@ * <uniformIndex> is greater than or equal to ACTIVE_UNIFORMS. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-array-stride.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-array-stride.c index 60da29d6c..d7641e0c2 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-array-stride.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-array-stride.c @@ -27,7 +27,7 @@ * correctly through the API. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c index be5778f02..76283d068 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-block-index.c @@ -28,7 +28,7 @@ * glGetUniformBlockIndex.() */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c index 9c63e2031..41a5e47ad 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-matrix-stride.c @@ -31,7 +31,7 @@ * a non-matrix value. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-type.c b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-type.c index 954caeeb2..fc54036e6 100644 --- a/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-type.c +++ b/tests/spec/arb_uniform_buffer_object/getactiveuniformsiv-uniform-type.c @@ -27,7 +27,7 @@ * GL_UNIFORM_TYPE for variables in a UBO. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "uniform-types.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getintegeri_v.c b/tests/spec/arb_uniform_buffer_object/getintegeri_v.c index 99bee7675..d1b685f0e 100644 --- a/tests/spec/arb_uniform_buffer_object/getintegeri_v.c +++ b/tests/spec/arb_uniform_buffer_object/getintegeri_v.c @@ -35,7 +35,7 @@ * is bound to <index>, -1 is returned." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getprogramiv.c b/tests/spec/arb_uniform_buffer_object/getprogramiv.c index 3be82458e..e032cbfbd 100644 --- a/tests/spec/arb_uniform_buffer_object/getprogramiv.c +++ b/tests/spec/arb_uniform_buffer_object/getprogramiv.c @@ -33,7 +33,7 @@ * terminator, is returned." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c b/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c index 84a5771d5..0dafc53ce 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c @@ -28,7 +28,7 @@ * for active blocks. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getuniformindices.c b/tests/spec/arb_uniform_buffer_object/getuniformindices.c index 900bad528..43fbb2cc6 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformindices.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformindices.c @@ -27,7 +27,7 @@ * invalid uniform names, and consecutive indices starting from 0. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/getuniformlocation.c b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c index af29b2179..81b5c8902 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformlocation.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c @@ -37,7 +37,7 @@ * <name> is associated with a named uniform block..." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c b/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c index e4a5162f5..ffef8d13e 100644 --- a/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c +++ b/tests/spec/arb_uniform_buffer_object/layout-std140-base-size-and-alignment.c @@ -28,7 +28,7 @@ * that, thus testing the size and base alignment for them. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "uniform-types.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/layout-std140.c b/tests/spec/arb_uniform_buffer_object/layout-std140.c index 93b445301..cb3cff363 100644 --- a/tests/spec/arb_uniform_buffer_object/layout-std140.c +++ b/tests/spec/arb_uniform_buffer_object/layout-std140.c @@ -34,7 +34,7 @@ * http://www.opengl.org/registry/specs/ARB/uniform_buffer_object.txt */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/link-mismatch-blocks.c b/tests/spec/arb_uniform_buffer_object/link-mismatch-blocks.c index 9e06926c1..20fc8e332 100644 --- a/tests/spec/arb_uniform_buffer_object/link-mismatch-blocks.c +++ b/tests/spec/arb_uniform_buffer_object/link-mismatch-blocks.c @@ -34,7 +34,7 @@ * (see next section). Any mismatch will generate a link error. " */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/maxblocks.c b/tests/spec/arb_uniform_buffer_object/maxblocks.c index 31b24e693..688cae142 100644 --- a/tests/spec/arb_uniform_buffer_object/maxblocks.c +++ b/tests/spec/arb_uniform_buffer_object/maxblocks.c @@ -44,7 +44,7 @@ * MAX_COMBINED_UNIFORM_BLOCKS." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/maxuniformblocksize.c b/tests/spec/arb_uniform_buffer_object/maxuniformblocksize.c index e1ffbc876..07b0bd03a 100644 --- a/tests/spec/arb_uniform_buffer_object/maxuniformblocksize.c +++ b/tests/spec/arb_uniform_buffer_object/maxuniformblocksize.c @@ -32,7 +32,7 @@ * "fsexceed" arguments. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/minmax.c b/tests/spec/arb_uniform_buffer_object/minmax.c index e5cd81af5..6d70efa48 100644 --- a/tests/spec/arb_uniform_buffer_object/minmax.c +++ b/tests/spec/arb_uniform_buffer_object/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.1 spec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c index 4a862c489..f387b8c93 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c @@ -27,7 +27,7 @@ * buffer binding point. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c index 5981c0f24..17561e16a 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c @@ -26,7 +26,7 @@ * Tests for errors when binding with a bad target. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c b/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c index d6f1ab3ce..9afca48a6 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c @@ -39,7 +39,7 @@ * <size> equal to the size of <buffer>." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c index 1d1c85fad..61d92aa85 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c +++ b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformblockiv.c @@ -46,7 +46,7 @@ * values." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "uniform-types.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformsiv.c b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformsiv.c index a2c268e6b..66fde4cac 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformsiv.c +++ b/tests/spec/arb_uniform_buffer_object/negative-getactiveuniformsiv.c @@ -47,7 +47,7 @@ * values." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "uniform-types.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/referenced-by-shader.c b/tests/spec/arb_uniform_buffer_object/referenced-by-shader.c index 6988d6bd3..4918c842f 100644 --- a/tests/spec/arb_uniform_buffer_object/referenced-by-shader.c +++ b/tests/spec/arb_uniform_buffer_object/referenced-by-shader.c @@ -35,7 +35,7 @@ * returned." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/rendering.c b/tests/spec/arb_uniform_buffer_object/rendering.c index d8b67f458..0f3b40832 100644 --- a/tests/spec/arb_uniform_buffer_object/rendering.c +++ b/tests/spec/arb_uniform_buffer_object/rendering.c @@ -27,7 +27,7 @@ * sizes, rotations and colors where those parameters come from UBOs. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/row-major.c b/tests/spec/arb_uniform_buffer_object/row-major.c index 4ec7a06ba..c7388c656 100644 --- a/tests/spec/arb_uniform_buffer_object/row-major.c +++ b/tests/spec/arb_uniform_buffer_object/row-major.c @@ -48,7 +48,7 @@ * results in the qualification being column_major." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_uniform_buffer_object/uniform-types.c b/tests/spec/arb_uniform_buffer_object/uniform-types.c index 0dcc94a39..0ce26a463 100644 --- a/tests/spec/arb_uniform_buffer_object/uniform-types.c +++ b/tests/spec/arb_uniform_buffer_object/uniform-types.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "uniform-types.h" const struct uniform_type uniform_types[] = { diff --git a/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c b/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c index 9e426a748..9676826d2 100644 --- a/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c +++ b/tests/spec/arb_uniform_buffer_object/uniformblockbinding.c @@ -56,7 +56,7 @@ * <program> is not a value generated by GL." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_array_bgra/api-errors.c b/tests/spec/arb_vertex_array_bgra/api-errors.c index 90ac38665..ce42d8392 100644 --- a/tests/spec/arb_vertex_array_bgra/api-errors.c +++ b/tests/spec/arb_vertex_array_bgra/api-errors.c @@ -27,7 +27,7 @@ * This tests a few error conditions from the ARB_vertex_array_bgra extension. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/spec/arb_vertex_array_bgra/get.c b/tests/spec/arb_vertex_array_bgra/get.c index 05dc2f3f1..b3f8256d2 100644 --- a/tests/spec/arb_vertex_array_bgra/get.c +++ b/tests/spec/arb_vertex_array_bgra/get.c @@ -29,7 +29,7 @@ * https://github.com/apitrace/apitrace/issues/261 . */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/spec/arb_vertex_array_object/isvertexarray.c b/tests/spec/arb_vertex_array_object/isvertexarray.c index 0505eba0c..7a2d890e7 100644 --- a/tests/spec/arb_vertex_array_object/isvertexarray.c +++ b/tests/spec/arb_vertex_array_object/isvertexarray.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file isvertexarray.c diff --git a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c index d9a4c4396..1652b29de 100644 --- a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c +++ b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c @@ -28,7 +28,7 @@ * to access the new vertex data. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_buffer_object/ib-data-sync.c b/tests/spec/arb_vertex_buffer_object/ib-data-sync.c index f8ee602fc..7c464c21a 100644 --- a/tests/spec/arb_vertex_buffer_object/ib-data-sync.c +++ b/tests/spec/arb_vertex_buffer_object/ib-data-sync.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/spec/arb_vertex_buffer_object/ib-subdata-sync.c b/tests/spec/arb_vertex_buffer_object/ib-subdata-sync.c index 019d745d1..6540df818 100644 --- a/tests/spec/arb_vertex_buffer_object/ib-subdata-sync.c +++ b/tests/spec/arb_vertex_buffer_object/ib-subdata-sync.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/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c b/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c index aae9e8e72..95f8c11d3 100644 --- a/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c +++ b/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c @@ -30,7 +30,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=37934 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_buffer_object/vbo-subdata-many.c b/tests/spec/arb_vertex_buffer_object/vbo-subdata-many.c index 92ab39605..2ca0c5bda 100644 --- a/tests/spec/arb_vertex_buffer_object/vbo-subdata-many.c +++ b/tests/spec/arb_vertex_buffer_object/vbo-subdata-many.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/spec/arb_vertex_program/getenv4d-with-error.c b/tests/spec/arb_vertex_program/getenv4d-with-error.c index 39e6cf182..d219472b3 100644 --- a/tests/spec/arb_vertex_program/getenv4d-with-error.c +++ b/tests/spec/arb_vertex_program/getenv4d-with-error.c @@ -28,7 +28,7 @@ * context. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_program/getlocal4-errors.c b/tests/spec/arb_vertex_program/getlocal4-errors.c index 832cf9ee9..b2e710323 100644 --- a/tests/spec/arb_vertex_program/getlocal4-errors.c +++ b/tests/spec/arb_vertex_program/getlocal4-errors.c @@ -36,7 +36,7 @@ * parameters for the program target." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_program/getlocal4d-with-error.c b/tests/spec/arb_vertex_program/getlocal4d-with-error.c index b990eaae8..0a6782e3a 100644 --- a/tests/spec/arb_vertex_program/getlocal4d-with-error.c +++ b/tests/spec/arb_vertex_program/getlocal4d-with-error.c @@ -28,7 +28,7 @@ * context. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_program/getlocal4f-max.c b/tests/spec/arb_vertex_program/getlocal4f-max.c index 4467a3c78..1c23c9f23 100644 --- a/tests/spec/arb_vertex_program/getlocal4f-max.c +++ b/tests/spec/arb_vertex_program/getlocal4f-max.c @@ -28,7 +28,7 @@ * than that. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_program/minmax.c b/tests/spec/arb_vertex_program/minmax.c index 80699c6b3..4fdf20a45 100644 --- a/tests/spec/arb_vertex_program/minmax.c +++ b/tests/spec/arb_vertex_program/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum values in GL_ARB_vertex_program. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_type_10f_11f_11f_rev/api-errors.c b/tests/spec/arb_vertex_type_10f_11f_11f_rev/api-errors.c index 843f8d548..a50470c68 100644 --- a/tests/spec/arb_vertex_type_10f_11f_11f_rev/api-errors.c +++ b/tests/spec/arb_vertex_type_10f_11f_11f_rev/api-errors.c @@ -27,7 +27,7 @@ * This tests a few error conditions from the ARB_vertex_type_10f_11f_11f_rev extension. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; diff --git a/tests/spec/arb_vertex_type_10f_11f_11f_rev/draw-vertices.c b/tests/spec/arb_vertex_type_10f_11f_11f_rev/draw-vertices.c index f94b0c326..79172165f 100644 --- a/tests/spec/arb_vertex_type_10f_11f_11f_rev/draw-vertices.c +++ b/tests/spec/arb_vertex_type_10f_11f_11f_rev/draw-vertices.c @@ -28,7 +28,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "r11g11b10f.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c index 8db45efef..fd34ee5a0 100644 --- a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c +++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c @@ -27,7 +27,7 @@ /* this test does some basic tests of ARB_vertex_type_2_10_10_10 vbos */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-p-types.c b/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-p-types.c index 09b8a2dcc..f25135634 100644 --- a/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-p-types.c +++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-p-types.c @@ -30,7 +30,7 @@ * respectively." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-pointer-type-size-match.c b/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-pointer-type-size-match.c index 098e5f763..6eb9596ff 100644 --- a/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-pointer-type-size-match.c +++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/vertex-attrib-pointer-type-size-match.c @@ -33,7 +33,7 @@ * is neither 4 or BGRA;" */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/bounds.c b/tests/spec/arb_viewport_array/bounds.c index f75aafb13..b34d96271 100644 --- a/tests/spec/arb_viewport_array/bounds.c +++ b/tests/spec/arb_viewport_array/bounds.c @@ -28,7 +28,7 @@ * Scissor Box bounds with viewport arrays (0 to GL_MAX_VIEWPORTS-1). * "Bounds" are the rectangle or range (eg x, y, width, height). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/clear.c b/tests/spec/arb_viewport_array/clear.c index caec8cdad..96facf55f 100644 --- a/tests/spec/arb_viewport_array/clear.c +++ b/tests/spec/arb_viewport_array/clear.c @@ -26,7 +26,7 @@ * Verify that glClear uses the scissor rectangle from viewport 0. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/depth_range_indices.c b/tests/spec/arb_viewport_array/depth_range_indices.c index e7ce9cfa1..84b524f3f 100644 --- a/tests/spec/arb_viewport_array/depth_range_indices.c +++ b/tests/spec/arb_viewport_array/depth_range_indices.c @@ -31,7 +31,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <stdarg.h> PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/minmax.c b/tests/spec/arb_viewport_array/minmax.c index c2fdca02b..ff490484f 100644 --- a/tests/spec/arb_viewport_array/minmax.c +++ b/tests/spec/arb_viewport_array/minmax.c @@ -32,7 +32,7 @@ * GL_LAYER_PROVOKING_VERTEX, GL_VIEWPORT_INDEX_PROVOKING_VERTEX. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/queries.c b/tests/spec/arb_viewport_array/queries.c index a99ed9f04..74b15d19c 100644 --- a/tests/spec/arb_viewport_array/queries.c +++ b/tests/spec/arb_viewport_array/queries.c @@ -31,7 +31,7 @@ * correctly queried. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/render_depthrange.c b/tests/spec/arb_viewport_array/render_depthrange.c index 4c1e463fb..b695f4fe3 100644 --- a/tests/spec/arb_viewport_array/render_depthrange.c +++ b/tests/spec/arb_viewport_array/render_depthrange.c @@ -39,7 +39,7 @@ * for (uint i = 0; i < MAX_VIEWPORTS; i++) * DepthRangeIndexed(i, n, f );" */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/render_scissor.c b/tests/spec/arb_viewport_array/render_scissor.c index 1e921a330..02de7ced0 100644 --- a/tests/spec/arb_viewport_array/render_scissor.c +++ b/tests/spec/arb_viewport_array/render_scissor.c @@ -39,7 +39,7 @@ * polygons, the scissor rectangle for a primitive is selected in the same * manner as the viewport (see section 13.6.1)." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/render_viewport.c b/tests/spec/arb_viewport_array/render_viewport.c index 4b69945ae..192133aac 100644 --- a/tests/spec/arb_viewport_array/render_viewport.c +++ b/tests/spec/arb_viewport_array/render_viewport.c @@ -36,7 +36,7 @@ * of primitives destined for separate viewport rectangles on the same * surface. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/scissor_check.c b/tests/spec/arb_viewport_array/scissor_check.c index 8a86658af..71f76e373 100644 --- a/tests/spec/arb_viewport_array/scissor_check.c +++ b/tests/spec/arb_viewport_array/scissor_check.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/spec/arb_viewport_array/scissor_indices.c b/tests/spec/arb_viewport_array/scissor_indices.c index 0bc00652a..d7bbbab4d 100644 --- a/tests/spec/arb_viewport_array/scissor_indices.c +++ b/tests/spec/arb_viewport_array/scissor_indices.c @@ -32,7 +32,7 @@ * Also test SCISSOR_TEST indices with glEnablei and others. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <stdarg.h> PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/arb_viewport_array/viewport_indices.c b/tests/spec/arb_viewport_array/viewport_indices.c index 534574378..96ab1660a 100644 --- a/tests/spec/arb_viewport_array/viewport_indices.c +++ b/tests/spec/arb_viewport_array/viewport_indices.c @@ -35,7 +35,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <stdarg.h> PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ati_draw_buffers/arbfp-no-index.c b/tests/spec/ati_draw_buffers/arbfp-no-index.c index 874f8af42..4ca73314d 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-index.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-index.c @@ -39,7 +39,7 @@ * This bug in Mesa impacted Trine. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ati_draw_buffers/arbfp-no-option.c b/tests/spec/ati_draw_buffers/arbfp-no-option.c index 2b73a3254..b5202ae37 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-option.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-option.c @@ -38,7 +38,7 @@ * into which output color 0 is written.' */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ati_draw_buffers/arbfp.c b/tests/spec/ati_draw_buffers/arbfp.c index 2cc319b91..7b25b1439 100644 --- a/tests/spec/ati_draw_buffers/arbfp.c +++ b/tests/spec/ati_draw_buffers/arbfp.c @@ -32,7 +32,7 @@ * ATI_draw_buffers and ARB_fragment_program works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ati_envmap_bumpmap/bump.c b/tests/spec/ati_envmap_bumpmap/bump.c index 41c06ccbd..aa64b9de5 100644 --- a/tests/spec/ati_envmap_bumpmap/bump.c +++ b/tests/spec/ati_envmap_bumpmap/bump.c @@ -26,7 +26,7 @@ * Test of ATI_envmap_bumpmap texture combiners. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEXSIZE 32 diff --git a/tests/spec/ext_fog_coord/modes.c b/tests/spec/ext_fog_coord/modes.c index 7939a33d1..a31659515 100644 --- a/tests/spec/ext_fog_coord/modes.c +++ b/tests/spec/ext_fog_coord/modes.c @@ -26,7 +26,7 @@ * Tests that the three fog modes work with fog enabled using EXT_fog_coord. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #if defined(_WIN32) #undef near diff --git a/tests/spec/ext_framebuffer_multisample/alpha-blending-after-rendering.c b/tests/spec/ext_framebuffer_multisample/alpha-blending-after-rendering.c index bc274ea30..a654f9f20 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-blending-after-rendering.c +++ b/tests/spec/ext_framebuffer_multisample/alpha-blending-after-rendering.c @@ -40,7 +40,7 @@ * - Partially covered by one color, partially by another color */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_framebuffer_multisample/alpha-blending.c b/tests/spec/ext_framebuffer_multisample/alpha-blending.c index f7c6c0f79..cf8d572b3 100644 --- a/tests/spec/ext_framebuffer_multisample/alpha-blending.c +++ b/tests/spec/ext_framebuffer_multisample/alpha-blending.c @@ -39,7 +39,7 @@ * to use a clear color that cannot be fast cleared. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" GLuint framebuffer, renderbuffer; #define WIDTH 300 diff --git a/tests/spec/ext_framebuffer_multisample/common.h b/tests/spec/ext_framebuffer_multisample/common.h index f7938357f..948a1d4a8 100644 --- a/tests/spec/ext_framebuffer_multisample/common.h +++ b/tests/spec/ext_framebuffer_multisample/common.h @@ -26,7 +26,7 @@ * test cases. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-test-pattern.h" #include "piglit-fbo.h" #include "math.h" diff --git a/tests/spec/ext_framebuffer_multisample/dlist.c b/tests/spec/ext_framebuffer_multisample/dlist.c index 6a3d2b498..7d7d96ebe 100644 --- a/tests/spec/ext_framebuffer_multisample/dlist.c +++ b/tests/spec/ext_framebuffer_multisample/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file dlist.c diff --git a/tests/spec/ext_framebuffer_multisample/minmax.c b/tests/spec/ext_framebuffer_multisample/minmax.c index a78842792..d825afdab 100644 --- a/tests/spec/ext_framebuffer_multisample/minmax.c +++ b/tests/spec/ext_framebuffer_multisample/minmax.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file max_samples.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c index a2db0e031..3401c9e3d 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c +++ b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file negative-copypixels.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c index 1c9c5bb79..c5bbbbf10 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c +++ b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file negative-copyteximage.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c index e68ead509..3da692644 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c +++ b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file negative-max-samples.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c b/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c index 0f372f46b..cbd9143b2 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c +++ b/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file samples.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-readpixels.c b/tests/spec/ext_framebuffer_multisample/negative-readpixels.c index ffab6e7f1..bcc07a8a7 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-readpixels.c +++ b/tests/spec/ext_framebuffer_multisample/negative-readpixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file negative-readpixels.c diff --git a/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c index 85cad0673..8d3eb32a2 100644 --- a/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c +++ b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file renderbuffer-samples.c diff --git a/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c index 948ccf039..7c99c87b4 100644 --- a/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c +++ b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file renderbufferstorage-samples.c diff --git a/tests/spec/ext_framebuffer_multisample/samples.c b/tests/spec/ext_framebuffer_multisample/samples.c index e5a612b1d..1833e1427 100644 --- a/tests/spec/ext_framebuffer_multisample/samples.c +++ b/tests/spec/ext_framebuffer_multisample/samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file samples.c diff --git a/tests/spec/ext_image_dma_buf_import/image_common.h b/tests/spec/ext_image_dma_buf_import/image_common.h index 3ace6bc4f..f9845c7cb 100644 --- a/tests/spec/ext_image_dma_buf_import/image_common.h +++ b/tests/spec/ext_image_dma_buf_import/image_common.h @@ -35,7 +35,7 @@ #include <drm_fourcc.h> #include "piglit-util-egl.h" -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /* We define here the enums for EGL_EXT_image_dma_buf_import because, as of * today (2013-09-10), the eglext.h on many systems lack them. The first Mesa diff --git a/tests/spec/ext_image_dma_buf_import/sample_common.h b/tests/spec/ext_image_dma_buf_import/sample_common.h index 648a2f983..8559e9fe5 100644 --- a/tests/spec/ext_image_dma_buf_import/sample_common.h +++ b/tests/spec/ext_image_dma_buf_import/sample_common.h @@ -24,7 +24,7 @@ #define SAMPLE_COMMON_H #include "piglit-util-egl.h" -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * Create a dma buffer with format 'fourcc' setting the given pixels as its diff --git a/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c b/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c index a87dd12ca..62f461a47 100644 --- a/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c +++ b/tests/spec/ext_packed_depth_stencil/depth-stencil-texture.c @@ -39,7 +39,7 @@ * generate an error. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_packed_depth_stencil/errors.c b/tests/spec/ext_packed_depth_stencil/errors.c index bb8654bc3..89de8c433 100644 --- a/tests/spec/ext_packed_depth_stencil/errors.c +++ b/tests/spec/ext_packed_depth_stencil/errors.c @@ -26,7 +26,7 @@ * Based on an original Glean test written by Brian Paul. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; diff --git a/tests/spec/ext_packed_depth_stencil/getteximage.c b/tests/spec/ext_packed_depth_stencil/getteximage.c index 6974ec83f..2302e6f82 100644 --- a/tests/spec/ext_packed_depth_stencil/getteximage.c +++ b/tests/spec/ext_packed_depth_stencil/getteximage.c @@ -32,7 +32,7 @@ * textures as z24s8 versus s8z24. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; diff --git a/tests/spec/ext_packed_depth_stencil/readdrawpixels.c b/tests/spec/ext_packed_depth_stencil/readdrawpixels.c index f11febc9d..e701b88af 100644 --- a/tests/spec/ext_packed_depth_stencil/readdrawpixels.c +++ b/tests/spec/ext_packed_depth_stencil/readdrawpixels.c @@ -26,7 +26,7 @@ * Based on an original Glean test written by Brian Paul. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; diff --git a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c index 966e03e65..dd3afc0fd 100644 --- a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c +++ b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c @@ -28,7 +28,7 @@ * combinations. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUF_WIDTH 15 #define BUF_HEIGHT 15 diff --git a/tests/spec/ext_packed_depth_stencil/texsubimage.c b/tests/spec/ext_packed_depth_stencil/texsubimage.c index b4cd2149c..6b9a917ab 100644 --- a/tests/spec/ext_packed_depth_stencil/texsubimage.c +++ b/tests/spec/ext_packed_depth_stencil/texsubimage.c @@ -29,7 +29,7 @@ * read back using glGetTexImage and compared to the expected values. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c index 0a1766c52..05fa006ac 100644 --- a/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c +++ b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c @@ -67,7 +67,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_packed_float/pack.c b/tests/spec/ext_packed_float/pack.c index abcaf1c5c..cfbabd8c7 100644 --- a/tests/spec/ext_packed_float/pack.c +++ b/tests/spec/ext_packed_float/pack.c @@ -27,7 +27,7 @@ * GL_UNSIGNED_INT_10F_11F_11F_REV format. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_array/compressed.c b/tests/spec/ext_texture_array/compressed.c index dc412e6cf..65d495ca5 100644 --- a/tests/spec/ext_texture_array/compressed.c +++ b/tests/spec/ext_texture_array/compressed.c @@ -50,7 +50,7 @@ * desktop GL, it is performed using S3TC textures. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-compressed-grays.h" #ifdef PIGLIT_USE_OPENGL diff --git a/tests/spec/ext_texture_array/gen-mipmap.c b/tests/spec/ext_texture_array/gen-mipmap.c index f0a306f71..f54be0809 100644 --- a/tests/spec/ext_texture_array/gen-mipmap.c +++ b/tests/spec/ext_texture_array/gen-mipmap.c @@ -31,7 +31,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; diff --git a/tests/spec/ext_texture_array/maxlayers.c b/tests/spec/ext_texture_array/maxlayers.c index b0d3f3028..05fbc27c2 100644 --- a/tests/spec/ext_texture_array/maxlayers.c +++ b/tests/spec/ext_texture_array/maxlayers.c @@ -28,7 +28,7 @@ * GL_MAX_TEXTURE_LAYERS layers. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_integer/api-drawpixels.c b/tests/spec/ext_texture_integer/api-drawpixels.c index 371d78936..ca7cee1a2 100644 --- a/tests/spec/ext_texture_integer/api-drawpixels.c +++ b/tests/spec/ext_texture_integer/api-drawpixels.c @@ -56,7 +56,7 @@ * specification and check that impleentations follow that. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_integer/api-readpixels.c b/tests/spec/ext_texture_integer/api-readpixels.c index 2c93a5b19..c0c23b23d 100644 --- a/tests/spec/ext_texture_integer/api-readpixels.c +++ b/tests/spec/ext_texture_integer/api-readpixels.c @@ -28,7 +28,7 @@ * Tests GL_EXT_texture_integer's error behavior with glReadPixels(). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_integer/api-teximage.c b/tests/spec/ext_texture_integer/api-teximage.c index 3c408b481..cc061e7e3 100644 --- a/tests/spec/ext_texture_integer/api-teximage.c +++ b/tests/spec/ext_texture_integer/api-teximage.c @@ -28,7 +28,7 @@ * Tests GL_EXT_texture_integer's error behavior with glTexImage2D(). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_integer/fbo-blending.c b/tests/spec/ext_texture_integer/fbo-blending.c index 832bbcb6f..16e05fa62 100644 --- a/tests/spec/ext_texture_integer/fbo-blending.c +++ b/tests/spec/ext_texture_integer/fbo-blending.c @@ -40,7 +40,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c b/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c index e9cdcad84..f4bf4526c 100644 --- a/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c +++ b/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c @@ -32,7 +32,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c b/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c index 1682253d0..63c49ef26 100644 --- a/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c +++ b/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c @@ -32,7 +32,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_integer/getteximage-clamping.c b/tests/spec/ext_texture_integer/getteximage-clamping.c index 92760c6e7..e552578fa 100644 --- a/tests/spec/ext_texture_integer/getteximage-clamping.c +++ b/tests/spec/ext_texture_integer/getteximage-clamping.c @@ -44,7 +44,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_integer/texture-integer-glsl130.c b/tests/spec/ext_texture_integer/texture-integer-glsl130.c index 1fefa5ab6..73da8ae16 100644 --- a/tests/spec/ext_texture_integer/texture-integer-glsl130.c +++ b/tests/spec/ext_texture_integer/texture-integer-glsl130.c @@ -28,7 +28,7 @@ * simpler test modified for GLSL1.30 by airlied */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_swizzle/api.c b/tests/spec/ext_texture_swizzle/api.c index 7c2bbae11..19486f278 100644 --- a/tests/spec/ext_texture_swizzle/api.c +++ b/tests/spec/ext_texture_swizzle/api.c @@ -28,7 +28,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; diff --git a/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c b/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c index 2665ba10f..61a0e9c02 100644 --- a/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c +++ b/tests/spec/ext_texture_swizzle/depth_texture_mode_and_swizzle.c @@ -37,7 +37,7 @@ * against those pitfalls. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_texture_swizzle/swizzle.c b/tests/spec/ext_texture_swizzle/swizzle.c index 858e1a80f..7a33e570a 100644 --- a/tests/spec/ext_texture_swizzle/swizzle.c +++ b/tests/spec/ext_texture_swizzle/swizzle.c @@ -28,7 +28,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 12; diff --git a/tests/spec/ext_timer_query/lifetime.c b/tests/spec/ext_timer_query/lifetime.c index 557d6260f..a0490625b 100644 --- a/tests/spec/ext_timer_query/lifetime.c +++ b/tests/spec/ext_timer_query/lifetime.c @@ -32,7 +32,7 @@ * of a timer query's lifetime. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_timer_query/time-elapsed.c b/tests/spec/ext_timer_query/time-elapsed.c index 234c1f2c8..c25abfc76 100644 --- a/tests/spec/ext_timer_query/time-elapsed.c +++ b/tests/spec/ext_timer_query/time-elapsed.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file time-elapsed.c diff --git a/tests/spec/ext_transform_feedback/alignment.c b/tests/spec/ext_transform_feedback/alignment.c index 440a44e7c..6cf9e0ee2 100644 --- a/tests/spec/ext_transform_feedback/alignment.c +++ b/tests/spec/ext_transform_feedback/alignment.c @@ -32,7 +32,7 @@ * glBindBufferRange(). This value may be 0, 4, 8, or 12. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUFFER_SIZE 0x40 diff --git a/tests/spec/ext_transform_feedback/api-errors.c b/tests/spec/ext_transform_feedback/api-errors.c index 23ff37c6e..57bb97f90 100644 --- a/tests/spec/ext_transform_feedback/api-errors.c +++ b/tests/spec/ext_transform_feedback/api-errors.c @@ -48,7 +48,7 @@ * implementation is not overly aggressive in flagging errors. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/buffer-usage.c b/tests/spec/ext_transform_feedback/buffer-usage.c index f34f02bcc..2596f29c0 100644 --- a/tests/spec/ext_transform_feedback/buffer-usage.c +++ b/tests/spec/ext_transform_feedback/buffer-usage.c @@ -28,7 +28,7 @@ * segfault on certain buffer object allocation 'usage' arguments. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define NUM_POINTS 10002 #define SHIFT_COUNT 64 diff --git a/tests/spec/ext_transform_feedback/builtin-varyings.c b/tests/spec/ext_transform_feedback/builtin-varyings.c index 910c46bc1..026d557dd 100644 --- a/tests/spec/ext_transform_feedback/builtin-varyings.c +++ b/tests/spec/ext_transform_feedback/builtin-varyings.c @@ -32,7 +32,7 @@ * them. Same for gl_FrontSecondaryColor and gl_BackSecondaryColor. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/change-size.c b/tests/spec/ext_transform_feedback/change-size.c index dca857ade..7378e5b93 100644 --- a/tests/spec/ext_transform_feedback/change-size.c +++ b/tests/spec/ext_transform_feedback/change-size.c @@ -76,7 +76,7 @@ * the buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/discard-api.c b/tests/spec/ext_transform_feedback/discard-api.c index f7f7afe63..5334c4030 100644 --- a/tests/spec/ext_transform_feedback/discard-api.c +++ b/tests/spec/ext_transform_feedback/discard-api.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file discard-api.c diff --git a/tests/spec/ext_transform_feedback/discard-bitmap.c b/tests/spec/ext_transform_feedback/discard-bitmap.c index dcd492c3d..f3946aba8 100644 --- a/tests/spec/ext_transform_feedback/discard-bitmap.c +++ b/tests/spec/ext_transform_feedback/discard-bitmap.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file discard-bitmap.c diff --git a/tests/spec/ext_transform_feedback/discard-clear.c b/tests/spec/ext_transform_feedback/discard-clear.c index fd3a39883..121004581 100644 --- a/tests/spec/ext_transform_feedback/discard-clear.c +++ b/tests/spec/ext_transform_feedback/discard-clear.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file discard-clear.c diff --git a/tests/spec/ext_transform_feedback/discard-copypixels.c b/tests/spec/ext_transform_feedback/discard-copypixels.c index cfe7829aa..bd89be0b8 100644 --- a/tests/spec/ext_transform_feedback/discard-copypixels.c +++ b/tests/spec/ext_transform_feedback/discard-copypixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file discard-copypixels.c diff --git a/tests/spec/ext_transform_feedback/discard-drawarrays.c b/tests/spec/ext_transform_feedback/discard-drawarrays.c index d106b015b..8576b3297 100644 --- a/tests/spec/ext_transform_feedback/discard-drawarrays.c +++ b/tests/spec/ext_transform_feedback/discard-drawarrays.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file discard-drawarrays.c diff --git a/tests/spec/ext_transform_feedback/discard-drawpixels.c b/tests/spec/ext_transform_feedback/discard-drawpixels.c index d8ea383b8..83de7d72b 100644 --- a/tests/spec/ext_transform_feedback/discard-drawpixels.c +++ b/tests/spec/ext_transform_feedback/discard-drawpixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file discard-drawpixels.c diff --git a/tests/spec/ext_transform_feedback/generatemipmap.c b/tests/spec/ext_transform_feedback/generatemipmap.c index a41ed6116..966610948 100644 --- a/tests/spec/ext_transform_feedback/generatemipmap.c +++ b/tests/spec/ext_transform_feedback/generatemipmap.c @@ -62,7 +62,7 @@ * tests/fbo/fbo-generatemipmap.c. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/spec/ext_transform_feedback/geometry-shaders-basic.c b/tests/spec/ext_transform_feedback/geometry-shaders-basic.c index ad63dc109..ef7f8b72f 100644 --- a/tests/spec/ext_transform_feedback/geometry-shaders-basic.c +++ b/tests/spec/ext_transform_feedback/geometry-shaders-basic.c @@ -38,7 +38,7 @@ * transform feedback buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define GEOM_OUT_VERTS 10 diff --git a/tests/spec/ext_transform_feedback/get-buffer-state.c b/tests/spec/ext_transform_feedback/get-buffer-state.c index 55bd2d24b..bdb9b5543 100644 --- a/tests/spec/ext_transform_feedback/get-buffer-state.c +++ b/tests/spec/ext_transform_feedback/get-buffer-state.c @@ -28,7 +28,7 @@ * transform feedback buffers. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/immediate-reuse.c b/tests/spec/ext_transform_feedback/immediate-reuse.c index 96cada626..17fa9ab7a 100644 --- a/tests/spec/ext_transform_feedback/immediate-reuse.c +++ b/tests/spec/ext_transform_feedback/immediate-reuse.c @@ -36,7 +36,7 @@ * a stepped gradient being drawn. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/interleaved.c b/tests/spec/ext_transform_feedback/interleaved.c index d0613443f..8b02fc72f 100644 --- a/tests/spec/ext_transform_feedback/interleaved.c +++ b/tests/spec/ext_transform_feedback/interleaved.c @@ -27,7 +27,7 @@ * Test writing interleaved vertex attribs into a buffer object. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/intervening-read.c b/tests/spec/ext_transform_feedback/intervening-read.c index d161979d9..13961822d 100644 --- a/tests/spec/ext_transform_feedback/intervening-read.c +++ b/tests/spec/ext_transform_feedback/intervening-read.c @@ -54,7 +54,7 @@ * transform feedback after the glReadPixels call. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static bool use_gs; diff --git a/tests/spec/ext_transform_feedback/max-varyings.c b/tests/spec/ext_transform_feedback/max-varyings.c index c1e378444..7028fb156 100644 --- a/tests/spec/ext_transform_feedback/max-varyings.c +++ b/tests/spec/ext_transform_feedback/max-varyings.c @@ -37,7 +37,7 @@ * possible lengths and offsets. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define MAX_VARYING 32 diff --git a/tests/spec/ext_transform_feedback/negative-prims.c b/tests/spec/ext_transform_feedback/negative-prims.c index a116a00fd..53a4f8398 100644 --- a/tests/spec/ext_transform_feedback/negative-prims.c +++ b/tests/spec/ext_transform_feedback/negative-prims.c @@ -41,7 +41,7 @@ * primitives) */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/nonflat-integral.c b/tests/spec/ext_transform_feedback/nonflat-integral.c index bdb97f50c..b21dd7e98 100644 --- a/tests/spec/ext_transform_feedback/nonflat-integral.c +++ b/tests/spec/ext_transform_feedback/nonflat-integral.c @@ -28,7 +28,7 @@ * with transform feedback. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; diff --git a/tests/spec/ext_transform_feedback/order.c b/tests/spec/ext_transform_feedback/order.c index 8a849df91..7de978ab6 100644 --- a/tests/spec/ext_transform_feedback/order.c +++ b/tests/spec/ext_transform_feedback/order.c @@ -52,7 +52,7 @@ * "triangles", "lines", or "points". */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define NUM_POINTS 10002 #define SHIFT_COUNT 64 diff --git a/tests/spec/ext_transform_feedback/output-type.c b/tests/spec/ext_transform_feedback/output-type.c index dc5ceed8c..6442d639f 100644 --- a/tests/spec/ext_transform_feedback/output-type.c +++ b/tests/spec/ext_transform_feedback/output-type.c @@ -28,7 +28,7 @@ * works as expected. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/overflow-edge-cases.c b/tests/spec/ext_transform_feedback/overflow-edge-cases.c index 42db6bd6e..a33a1d65d 100644 --- a/tests/spec/ext_transform_feedback/overflow-edge-cases.c +++ b/tests/spec/ext_transform_feedback/overflow-edge-cases.c @@ -48,7 +48,7 @@ * checking based on the post-geometry-shader vertex count. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static bool use_gs; diff --git a/tests/spec/ext_transform_feedback/position.c b/tests/spec/ext_transform_feedback/position.c index e278f7f6f..665ed01bd 100644 --- a/tests/spec/ext_transform_feedback/position.c +++ b/tests/spec/ext_transform_feedback/position.c @@ -28,7 +28,7 @@ * BindBufferOffset, BindBufferRange, GL_RASTERIZER_DISCARD, and related queries. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/primgen.c b/tests/spec/ext_transform_feedback/primgen.c index 37282cebc..74c56a9ff 100644 --- a/tests/spec/ext_transform_feedback/primgen.c +++ b/tests/spec/ext_transform_feedback/primgen.c @@ -29,7 +29,7 @@ * reaches the Discarding Rasterization stage" */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/separate.c b/tests/spec/ext_transform_feedback/separate.c index a03ded848..7cab4cefe 100644 --- a/tests/spec/ext_transform_feedback/separate.c +++ b/tests/spec/ext_transform_feedback/separate.c @@ -27,7 +27,7 @@ * Test writing separate vertex attribs into a buffer object. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/structs.c b/tests/spec/ext_transform_feedback/structs.c index bb4f7ac39..3d90bb9fd 100644 --- a/tests/spec/ext_transform_feedback/structs.c +++ b/tests/spec/ext_transform_feedback/structs.c @@ -100,7 +100,7 @@ * using interface blocks. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/ext_transform_feedback/tessellation.c b/tests/spec/ext_transform_feedback/tessellation.c index 3d118d87d..4cffc6e6b 100644 --- a/tests/spec/ext_transform_feedback/tessellation.c +++ b/tests/spec/ext_transform_feedback/tessellation.c @@ -116,7 +116,7 @@ * failures. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUFFER_SIZE 20 diff --git a/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c b/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c index 2e53195ea..e65f4be96 100644 --- a/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c +++ b/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c @@ -28,7 +28,7 @@ * Test GL_EXT_unpack_subimage. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.0/beginend-coverage.c b/tests/spec/gl-1.0/beginend-coverage.c index 71c69f5c8..bb704f8f4 100644 --- a/tests/spec/gl-1.0/beginend-coverage.c +++ b/tests/spec/gl-1.0/beginend-coverage.c @@ -44,7 +44,7 @@ * in the error INVALID OPERATION." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.0/dlist-beginend.c b/tests/spec/gl-1.0/dlist-beginend.c index 1493d120c..733376ad8 100644 --- a/tests/spec/gl-1.0/dlist-beginend.c +++ b/tests/spec/gl-1.0/dlist-beginend.c @@ -25,7 +25,7 @@ * Test some tricky cases of display lists and glBegin/End. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.0/dlist-shademodel.c b/tests/spec/gl-1.0/dlist-shademodel.c index 0b7752ed1..1be193f20 100644 --- a/tests/spec/gl-1.0/dlist-shademodel.c +++ b/tests/spec/gl-1.0/dlist-shademodel.c @@ -28,7 +28,7 @@ * compiler. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.0/edgeflag-const.c b/tests/spec/gl-1.0/edgeflag-const.c index e8051fc2c..e3ea927a6 100644 --- a/tests/spec/gl-1.0/edgeflag-const.c +++ b/tests/spec/gl-1.0/edgeflag-const.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.0/edgeflag-quads.c b/tests/spec/gl-1.0/edgeflag-quads.c index a96cc1165..dd8d4a234 100644 --- a/tests/spec/gl-1.0/edgeflag-quads.c +++ b/tests/spec/gl-1.0/edgeflag-quads.c @@ -29,7 +29,7 @@ * be broken down before submission to the hardware. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.0/edgeflag.c b/tests/spec/gl-1.0/edgeflag.c index a14724d65..bd9845c41 100644 --- a/tests/spec/gl-1.0/edgeflag.c +++ b/tests/spec/gl-1.0/edgeflag.c @@ -25,7 +25,7 @@ * Test for the glEdgeFlag() API working. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.0/front-invalidate-back.c b/tests/spec/gl-1.0/front-invalidate-back.c index 9e9c635dd..cdfb8e791 100644 --- a/tests/spec/gl-1.0/front-invalidate-back.c +++ b/tests/spec/gl-1.0/front-invalidate-back.c @@ -37,7 +37,7 @@ * glDrawBuffer() calls. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.0/long-dlist.c b/tests/spec/gl-1.0/long-dlist.c index d4d45ffb0..f8b86faff 100644 --- a/tests/spec/gl-1.0/long-dlist.c +++ b/tests/spec/gl-1.0/long-dlist.c @@ -27,7 +27,7 @@ * Ideally, this test should be run with valgrind. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.0/rendermode-feedback.c b/tests/spec/gl-1.0/rendermode-feedback.c index eb48bce56..04522cf84 100644 --- a/tests/spec/gl-1.0/rendermode-feedback.c +++ b/tests/spec/gl-1.0/rendermode-feedback.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file rendermode-feedback.c diff --git a/tests/spec/gl-1.0/swapbuffers-behavior.c b/tests/spec/gl-1.0/swapbuffers-behavior.c index 4c161ba0a..d914020a0 100644 --- a/tests/spec/gl-1.0/swapbuffers-behavior.c +++ b/tests/spec/gl-1.0/swapbuffers-behavior.c @@ -29,7 +29,7 @@ * This test just checks and reports which behavior is found. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.4/dlist-multidrawarrays.c b/tests/spec/gl-1.4/dlist-multidrawarrays.c index 093f95c00..7ddeb6080 100644 --- a/tests/spec/gl-1.4/dlist-multidrawarrays.c +++ b/tests/spec/gl-1.4/dlist-multidrawarrays.c @@ -26,7 +26,7 @@ * glMultiDrawArrays is part of GL 1.4 and later. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-1.5/normal3b3s-invariance.c b/tests/spec/gl-1.5/normal3b3s-invariance.c index 7531a3814..1e1fd0a46 100644 --- a/tests/spec/gl-1.5/normal3b3s-invariance.c +++ b/tests/spec/gl-1.5/normal3b3s-invariance.c @@ -43,7 +43,7 @@ * 11 April 2014 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-2.0/api/active-sampler-conflict.c b/tests/spec/gl-2.0/api/active-sampler-conflict.c index b35cc898b..74aed3689 100644 --- a/tests/spec/gl-2.0/api/active-sampler-conflict.c +++ b/tests/spec/gl-2.0/api/active-sampler-conflict.c @@ -56,7 +56,7 @@ * implementations that latch state in glValidateProgram and do not * re-validate in glBegin. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-2.0/api/attrib-assignments.c b/tests/spec/gl-2.0/api/attrib-assignments.c index 2d17a01be..9452549ea 100644 --- a/tests/spec/gl-2.0/api/attrib-assignments.c +++ b/tests/spec/gl-2.0/api/attrib-assignments.c @@ -34,7 +34,7 @@ * way, there's a reasonable chance it has bugs without its developers even * knowing. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-2.0/api/clip-flag-behavior.c b/tests/spec/gl-2.0/api/clip-flag-behavior.c index 1af9b14bf..25d7b4efd 100644 --- a/tests/spec/gl-2.0/api/clip-flag-behavior.c +++ b/tests/spec/gl-2.0/api/clip-flag-behavior.c @@ -36,7 +36,7 @@ * glDisable is consistent. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-2.0/api/getattriblocation-conventional.c b/tests/spec/gl-2.0/api/getattriblocation-conventional.c index d7027844a..9c1e3d747 100644 --- a/tests/spec/gl-2.0/api/getattriblocation-conventional.c +++ b/tests/spec/gl-2.0/api/getattriblocation-conventional.c @@ -28,7 +28,7 @@ * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-2.0/edgeflag-immediate.c b/tests/spec/gl-2.0/edgeflag-immediate.c index 8c0a96324..87e18e138 100644 --- a/tests/spec/gl-2.0/edgeflag-immediate.c +++ b/tests/spec/gl-2.0/edgeflag-immediate.c @@ -25,7 +25,7 @@ * Test for glEdgeFlag() API working with a GLSL program enabled. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-2.0/edgeflag.c b/tests/spec/gl-2.0/edgeflag.c index b8a0265c8..08be6aadf 100644 --- a/tests/spec/gl-2.0/edgeflag.c +++ b/tests/spec/gl-2.0/edgeflag.c @@ -30,7 +30,7 @@ * in Mesa. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-2.0/vertex-program-two-side.c b/tests/spec/gl-2.0/vertex-program-two-side.c index d600df508..786f070e0 100644 --- a/tests/spec/gl-2.0/vertex-program-two-side.c +++ b/tests/spec/gl-2.0/vertex-program-two-side.c @@ -42,7 +42,7 @@ * implies that two-sided behavior always occurs. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-2.0/vertexattribpointer.c b/tests/spec/gl-2.0/vertexattribpointer.c index 338311cd6..872447b7b 100644 --- a/tests/spec/gl-2.0/vertexattribpointer.c +++ b/tests/spec/gl-2.0/vertexattribpointer.c @@ -26,7 +26,7 @@ * normalized/unnormalized. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 20; diff --git a/tests/spec/gl-2.1/minmax.c b/tests/spec/gl-2.1/minmax.c index e495770c0..248f27d9e 100644 --- a/tests/spec/gl-2.1/minmax.c +++ b/tests/spec/gl-2.1/minmax.c @@ -26,7 +26,7 @@ * of the GL 2.1 spec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c index 20626a7ff..bbfe1c51c 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c +++ b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c @@ -27,7 +27,7 @@ * * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/api/bindfragdata-link-error.c b/tests/spec/gl-3.0/api/bindfragdata-link-error.c index 7e5d08690..c25ca67e0 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-link-error.c +++ b/tests/spec/gl-3.0/api/bindfragdata-link-error.c @@ -25,7 +25,7 @@ * * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c index c46f8c388..b91cc23ba 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c +++ b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c @@ -26,7 +26,7 @@ * * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/api/clearbuffer-common.c b/tests/spec/gl-3.0/api/clearbuffer-common.c index 1282164b1..6f6261baa 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-common.c +++ b/tests/spec/gl-3.0/api/clearbuffer-common.c @@ -24,7 +24,7 @@ * \file clearbuffer-common.c * Common code and data for the basic glClearBuffer tests */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" const float default_color[4] = { 0.2, 0.4, 0.6, 1.0 }; const float default_depth = 0.2; diff --git a/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c b/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c index a15a421a5..9d4dc0b0a 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c +++ b/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c @@ -47,7 +47,7 @@ * * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/clearbuffer-depth.c b/tests/spec/gl-3.0/api/clearbuffer-depth.c index 3bd549107..3318d2ed9 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-depth.c +++ b/tests/spec/gl-3.0/api/clearbuffer-depth.c @@ -47,7 +47,7 @@ * * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/clearbuffer-display-lists.c b/tests/spec/gl-3.0/api/clearbuffer-display-lists.c index cdc180dda..6f116e844 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-display-lists.c +++ b/tests/spec/gl-3.0/api/clearbuffer-display-lists.c @@ -31,7 +31,7 @@ * \author Anuj Phogat */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c index 7d11d8df3..b487af689 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c @@ -26,7 +26,7 @@ * * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c index aa057bbae..262b8b780 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c @@ -27,7 +27,7 @@ * * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c b/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c index e917daa39..8f5febe3c 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c +++ b/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c @@ -44,7 +44,7 @@ * \author Anuj Phogat */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "clearbuffer-common.h" #define COUNT ARRAY_SIZE(test_vectors) diff --git a/tests/spec/gl-3.0/api/clearbuffer-stencil.c b/tests/spec/gl-3.0/api/clearbuffer-stencil.c index a31d1a2a0..3cf75a63d 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-stencil.c +++ b/tests/spec/gl-3.0/api/clearbuffer-stencil.c @@ -47,7 +47,7 @@ * * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/forward-compatible-bit.c b/tests/spec/gl-3.0/api/forward-compatible-bit.c index d35782f6c..24faff9f1 100644 --- a/tests/spec/gl-3.0/api/forward-compatible-bit.c +++ b/tests/spec/gl-3.0/api/forward-compatible-bit.c @@ -28,7 +28,7 @@ * contain GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static void usage_error(void) diff --git a/tests/spec/gl-3.0/api/genmipmap-errors.c b/tests/spec/gl-3.0/api/genmipmap-errors.c index aa5eb094e..0b48cc1f1 100644 --- a/tests/spec/gl-3.0/api/genmipmap-errors.c +++ b/tests/spec/gl-3.0/api/genmipmap-errors.c @@ -27,7 +27,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/api/getfragdatalocation.c b/tests/spec/gl-3.0/api/getfragdatalocation.c index cb38c64ea..6b2bed4f0 100644 --- a/tests/spec/gl-3.0/api/getfragdatalocation.c +++ b/tests/spec/gl-3.0/api/getfragdatalocation.c @@ -25,7 +25,7 @@ * * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/api/integer-errors.c b/tests/spec/gl-3.0/api/integer-errors.c index 8323bb58e..acec20540 100644 --- a/tests/spec/gl-3.0/api/integer-errors.c +++ b/tests/spec/gl-3.0/api/integer-errors.c @@ -28,7 +28,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/bound-resource-limits.c b/tests/spec/gl-3.0/bound-resource-limits.c index 851c36165..1e5cf41c3 100644 --- a/tests/spec/gl-3.0/bound-resource-limits.c +++ b/tests/spec/gl-3.0/bound-resource-limits.c @@ -40,7 +40,7 @@ * 7 July 2014 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/minmax.c b/tests/spec/gl-3.0/minmax.c index 611b6eb9e..b80486c49 100644 --- a/tests/spec/gl-3.0/minmax.c +++ b/tests/spec/gl-3.0/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.0 spec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/render-integer.c b/tests/spec/gl-3.0/render-integer.c index bbebf3cdb..30b59c4ae 100644 --- a/tests/spec/gl-3.0/render-integer.c +++ b/tests/spec/gl-3.0/render-integer.c @@ -27,7 +27,7 @@ * 19 June 2014 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; diff --git a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c index 5236a3f8e..5a362be84 100644 --- a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c +++ b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "sized-internalformats.h" /** diff --git a/tests/spec/gl-3.0/required-sized-texture-formats.c b/tests/spec/gl-3.0/required-sized-texture-formats.c index fca3ac9fa..b536ecc92 100644 --- a/tests/spec/gl-3.0/required-sized-texture-formats.c +++ b/tests/spec/gl-3.0/required-sized-texture-formats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "sized-internalformats.h" /** diff --git a/tests/spec/gl-3.0/required-texture-attachment-formats.c b/tests/spec/gl-3.0/required-texture-attachment-formats.c index 9c9b234c8..a4fc6d392 100644 --- a/tests/spec/gl-3.0/required-texture-attachment-formats.c +++ b/tests/spec/gl-3.0/required-texture-attachment-formats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "sized-internalformats.h" /** diff --git a/tests/spec/gl-3.0/texture-integer.c b/tests/spec/gl-3.0/texture-integer.c index 149e11d50..5fe90aa33 100644 --- a/tests/spec/gl-3.0/texture-integer.c +++ b/tests/spec/gl-3.0/texture-integer.c @@ -27,7 +27,7 @@ * Tests OpenGL 3.0 integer textures */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.0/vertexattribipointer.c b/tests/spec/gl-3.0/vertexattribipointer.c index b69e7312f..b01fe51d9 100644 --- a/tests/spec/gl-3.0/vertexattribipointer.c +++ b/tests/spec/gl-3.0/vertexattribipointer.c @@ -26,7 +26,7 @@ * of types and sizes. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 30; diff --git a/tests/spec/gl-3.1/draw-buffers-errors.c b/tests/spec/gl-3.1/draw-buffers-errors.c index cc0bf51a5..c18065b37 100644 --- a/tests/spec/gl-3.1/draw-buffers-errors.c +++ b/tests/spec/gl-3.1/draw-buffers-errors.c @@ -36,7 +36,7 @@ * INVALID_OPERATION will be generated." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.1/genned-names.c b/tests/spec/gl-3.1/genned-names.c index dba8553a6..bc75ae4d6 100644 --- a/tests/spec/gl-3.1/genned-names.c +++ b/tests/spec/gl-3.1/genned-names.c @@ -33,7 +33,7 @@ * deleted with DeleteRenderbuffers." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.1/minmax.c b/tests/spec/gl-3.1/minmax.c index dd5cc2dfb..f1445c206 100644 --- a/tests/spec/gl-3.1/minmax.c +++ b/tests/spec/gl-3.1/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.1 spec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.1/primitive-restart-xfb.c b/tests/spec/gl-3.1/primitive-restart-xfb.c index 469084df9..f9cbe3e52 100644 --- a/tests/spec/gl-3.1/primitive-restart-xfb.c +++ b/tests/spec/gl-3.1/primitive-restart-xfb.c @@ -50,7 +50,7 @@ * location in the transform feedback buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 31; diff --git a/tests/spec/gl-3.2/clear-no-buffers.c b/tests/spec/gl-3.2/clear-no-buffers.c index c7b9c4522..0d6718acb 100644 --- a/tests/spec/gl-3.2/clear-no-buffers.c +++ b/tests/spec/gl-3.2/clear-no-buffers.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/spec/gl-3.2/depth-tex-sampling.c b/tests/spec/gl-3.2/depth-tex-sampling.c index 89827ba18..c41f1769a 100644 --- a/tests/spec/gl-3.2/depth-tex-sampling.c +++ b/tests/spec/gl-3.2/depth-tex-sampling.c @@ -34,7 +34,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; diff --git a/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c b/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c index eb1826aa5..7c247ba1d 100644 --- a/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c +++ b/tests/spec/gl-3.2/get-active-attrib-returns-all-inputs.c @@ -40,7 +40,7 @@ * active attribute limit (Bug 9201)." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/get-buffer-parameter-i64v.c b/tests/spec/gl-3.2/get-buffer-parameter-i64v.c index 4eccb848b..70ac18905 100644 --- a/tests/spec/gl-3.2/get-buffer-parameter-i64v.c +++ b/tests/spec/gl-3.2/get-buffer-parameter-i64v.c @@ -31,7 +31,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/get-integer-64iv.c b/tests/spec/gl-3.2/get-integer-64iv.c index 027bffb07..4b994f9e6 100644 --- a/tests/spec/gl-3.2/get-integer-64iv.c +++ b/tests/spec/gl-3.2/get-integer-64iv.c @@ -31,7 +31,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/get-integer-64v.c b/tests/spec/gl-3.2/get-integer-64v.c index fce2c5467..2e0e74b9e 100644 --- a/tests/spec/gl-3.2/get-integer-64v.c +++ b/tests/spec/gl-3.2/get-integer-64v.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/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c b/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c index 087e3c22a..f7d11117e 100644 --- a/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c +++ b/tests/spec/gl-3.2/gl-coord-replace-doesnt-eliminate-frag-tex-coords.c @@ -26,7 +26,7 @@ * coordinates (via the gl_TexCoord built-ins) don't get eliminated. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/glsl-resource-not-bound.c b/tests/spec/gl-3.2/glsl-resource-not-bound.c index afc7f7116..35857886f 100644 --- a/tests/spec/gl-3.2/glsl-resource-not-bound.c +++ b/tests/spec/gl-3.2/glsl-resource-not-bound.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/spec/gl-3.2/layered-rendering/blit.c b/tests/spec/gl-3.2/layered-rendering/blit.c index 78ebeb554..e5d865e09 100644 --- a/tests/spec/gl-3.2/layered-rendering/blit.c +++ b/tests/spec/gl-3.2/layered-rendering/blit.c @@ -49,7 +49,7 @@ * *---*---* */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c index facb1d582..403bc04cf 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-color-all-types.c @@ -59,7 +59,7 @@ * has been cleared to the expected color. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util.h" #define TEX_LEVELS 6 diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c index e27ecc711..63a43f3c7 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-color-mismatched-layer-count.c @@ -44,7 +44,7 @@ * been cleared to green. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util.h" #define TEX_SIZE 128 diff --git a/tests/spec/gl-3.2/layered-rendering/clear-color.c b/tests/spec/gl-3.2/layered-rendering/clear-color.c index 74a420a70..31233e355 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-color.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-color.c @@ -42,7 +42,7 @@ * Layer 1-3 of both tex1 and tex2 should be the clearColor */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/clear-depth.c b/tests/spec/gl-3.2/layered-rendering/clear-depth.c index e202ad5f1..fb4b23795 100644 --- a/tests/spec/gl-3.2/layered-rendering/clear-depth.c +++ b/tests/spec/gl-3.2/layered-rendering/clear-depth.c @@ -44,7 +44,7 @@ * Layer 1-4 of both tex1 and tex2 should be the clearDepth */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-attachment-mismatch.c b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-attachment-mismatch.c index 2ae07b14e..67bfea2ae 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-attachment-mismatch.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-attachment-mismatch.c @@ -39,7 +39,7 @@ * layers. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c index 742250b6b..ea12a04a2 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-complete.c @@ -30,7 +30,7 @@ * of the same target. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-count-mismatch.c b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-count-mismatch.c index 05cb8ecef..de9aae495 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-count-mismatch.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffer-layer-count-mismatch.c @@ -52,7 +52,7 @@ * if two different attachments have different layer counts. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffer-layered-attachments.c b/tests/spec/gl-3.2/layered-rendering/framebuffer-layered-attachments.c index d6e5b462e..79f4e545b 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffer-layered-attachments.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffer-layered-attachments.c @@ -45,7 +45,7 @@ * an array of images, and the framebuffer attachment is considered layered. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffertexture-buffer-textures.c b/tests/spec/gl-3.2/layered-rendering/framebuffertexture-buffer-textures.c index 331b09892..936a9c47d 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffertexture-buffer-textures.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffertexture-buffer-textures.c @@ -29,7 +29,7 @@ * of a buffer texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffertexture-defaults.c b/tests/spec/gl-3.2/layered-rendering/framebuffertexture-defaults.c index 3f0ca8cb3..a8b4e3ec9 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffertexture-defaults.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffertexture-defaults.c @@ -36,7 +36,7 @@ * values listed in table 6.23. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c b/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c index e5c75e2bb..d6eef1ed4 100644 --- a/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c +++ b/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c @@ -40,7 +40,7 @@ * is an array of images, and the framebuffer attachment is considered layered." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c b/tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c index 07f849a7f..167109d4d 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer-cube-map.c @@ -37,7 +37,7 @@ * 5 TEXTURE_CUBE_MAP_NEGATIVE_Z */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c b/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c index ebfa138df..f57e7e736 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer-not-layered.c @@ -30,7 +30,7 @@ * the framebuffer is not layered. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer-render.c b/tests/spec/gl-3.2/layered-rendering/gl-layer-render.c index 2c24fd54f..f58e3c66f 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer-render.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer-render.c @@ -31,7 +31,7 @@ * variable gl_Layer." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/gl-layer.c b/tests/spec/gl-3.2/layered-rendering/gl-layer.c index a25518ecd..991db90d1 100644 --- a/tests/spec/gl-3.2/layered-rendering/gl-layer.c +++ b/tests/spec/gl-3.2/layered-rendering/gl-layer.c @@ -45,7 +45,7 @@ * (0, 1, 0), and the remaining layers will be not set. */ - #include "piglit-util-gl-common.h" + #include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/layered-rendering/readpixels.c b/tests/spec/gl-3.2/layered-rendering/readpixels.c index bcccdfb1d..879bcdb14 100644 --- a/tests/spec/gl-3.2/layered-rendering/readpixels.c +++ b/tests/spec/gl-3.2/layered-rendering/readpixels.c @@ -31,7 +31,7 @@ * pixel values. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/minmax.c b/tests/spec/gl-3.2/minmax.c index 448b02e04..b8d9cfd36 100644 --- a/tests/spec/gl-3.2/minmax.c +++ b/tests/spec/gl-3.2/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.2 spec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.2/texture-border-deprecated.c b/tests/spec/gl-3.2/texture-border-deprecated.c index 6aa9933a5..625e6e5d1 100644 --- a/tests/spec/gl-3.2/texture-border-deprecated.c +++ b/tests/spec/gl-3.2/texture-border-deprecated.c @@ -31,7 +31,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gl-3.3/minmax.c b/tests/spec/gl-3.3/minmax.c index 072bfeccb..964e49964 100644 --- a/tests/spec/gl-3.3/minmax.c +++ b/tests/spec/gl-3.3/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.3 spec. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gles-2.0/fbo-discard.c b/tests/spec/gles-2.0/fbo-discard.c index 3590afe1e..c1e0b1253 100644 --- a/tests/spec/gles-2.0/fbo-discard.c +++ b/tests/spec/gles-2.0/fbo-discard.c @@ -49,7 +49,7 @@ * with <numAttachments> less than zero." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gles-2.0/glsl-fs-pointcoord.c b/tests/spec/gles-2.0/glsl-fs-pointcoord.c index 4be7b7401..41c6a37ca 100644 --- a/tests/spec/gles-2.0/glsl-fs-pointcoord.c +++ b/tests/spec/gles-2.0/glsl-fs-pointcoord.c @@ -55,7 +55,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/spec/gles-2.0/invalid-es3-queries.c b/tests/spec/gles-2.0/invalid-es3-queries.c index 113a29681..f8dc85a85 100644 --- a/tests/spec/gles-2.0/invalid-es3-queries.c +++ b/tests/spec/gles-2.0/invalid-es3-queries.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gles-2.0/link-no-vsfs.c b/tests/spec/gles-2.0/link-no-vsfs.c index 96599ec04..46ce056a5 100644 --- a/tests/spec/gles-2.0/link-no-vsfs.c +++ b/tests/spec/gles-2.0/link-no-vsfs.c @@ -36,7 +36,7 @@ * This also appears in the 3.0.2 spec, page 48. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gles-2.0/minmax.c b/tests/spec/gles-2.0/minmax.c index 72b8bf254..52ef1f5e8 100644 --- a/tests/spec/gles-2.0/minmax.c +++ b/tests/spec/gles-2.0/minmax.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gles-2.0/multiple-shader-objects.c b/tests/spec/gles-2.0/multiple-shader-objects.c index fd24d0c30..dd5116ea4 100644 --- a/tests/spec/gles-2.0/multiple-shader-objects.c +++ b/tests/spec/gles-2.0/multiple-shader-objects.c @@ -33,7 +33,7 @@ * This test checks that GL_INVALID_OPERATION is generated. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gles-3.0/minmax.c b/tests/spec/gles-3.0/minmax.c index f1b55b1f1..0b03afb40 100644 --- a/tests/spec/gles-3.0/minmax.c +++ b/tests/spec/gles-3.0/minmax.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c b/tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c index c38143fcc..0b1d44fd0 100644 --- a/tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c +++ b/tests/spec/gles-3.0/oes_compressed_etc2_texture-miptree.c @@ -44,7 +44,7 @@ * http://devtools.ericsson.com/etc. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit_ktx.h" static const int num_levels = 7; diff --git a/tests/spec/gles-3.0/texture-immutable-levels.c b/tests/spec/gles-3.0/texture-immutable-levels.c index c786da222..cb264c439 100644 --- a/tests/spec/gles-3.0/texture-immutable-levels.c +++ b/tests/spec/gles-3.0/texture-immutable-levels.c @@ -36,7 +36,7 @@ * correctly set to <levels>. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c b/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c index e8ac2f52f..346a9ef4d 100644 --- a/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c +++ b/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c @@ -168,7 +168,7 @@ * it does in fixed function mode. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c b/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c index ea171165e..b3b08a585 100644 --- a/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c +++ b/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c @@ -31,7 +31,7 @@ * shader to it still works. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.10/execution/varying-packing/simple.c b/tests/spec/glsl-1.10/execution/varying-packing/simple.c index f7fd64834..87ff37e23 100644 --- a/tests/spec/glsl-1.10/execution/varying-packing/simple.c +++ b/tests/spec/glsl-1.10/execution/varying-packing/simple.c @@ -95,7 +95,7 @@ * gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0); * } */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.20/recursion/recursion.c b/tests/spec/glsl-1.20/recursion/recursion.c index 0862e7cd1..7c3c4dc32 100644 --- a/tests/spec/glsl-1.20/recursion/recursion.c +++ b/tests/spec/glsl-1.20/recursion/recursion.c @@ -47,7 +47,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c index d8769370e..21821f738 100644 --- a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c +++ b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c @@ -57,7 +57,7 @@ * defined in the vertex and fragment shaders, and that this value is * at least 8. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c index 78ab97de7..2a003fea8 100644 --- a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c +++ b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c @@ -42,7 +42,7 @@ * 2x2 subspan aligned). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/execution/fs-execution-ordering.c b/tests/spec/glsl-1.30/execution/fs-execution-ordering.c index bf8e66b2a..a40ded263 100644 --- a/tests/spec/glsl-1.30/execution/fs-execution-ordering.c +++ b/tests/spec/glsl-1.30/execution/fs-execution-ordering.c @@ -33,7 +33,7 @@ * of a race condition occurring. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define SHIFT_COUNT 64 diff --git a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c index 494cfa49a..66aee58d1 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c @@ -29,7 +29,7 @@ * Creates a mipmapped 64x32 2D texture and draws a series of squares whose * color contains a texel fetched from each quadrant of the rgbw texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c index cf5c1ec20..19059001e 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c @@ -29,7 +29,7 @@ * Creates a mipmapped 64x32 2D texture and draws a series of squares whose * color contains a texel fetched from each quadrant of the rgbw texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/execution/fs-textureOffset-2D.c b/tests/spec/glsl-1.30/execution/fs-textureOffset-2D.c index e796df7c2..be9efc3f6 100644 --- a/tests/spec/glsl-1.30/execution/fs-textureOffset-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-textureOffset-2D.c @@ -31,7 +31,7 @@ * * Author: Roland Scheidegger */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c index ca9abef97..a726b1d79 100644 --- a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c +++ b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c @@ -108,7 +108,7 @@ * out of the shader. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/execution/vertexid-beginend.c b/tests/spec/glsl-1.30/execution/vertexid-beginend.c index e805ab1e8..d7aead88f 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-beginend.c +++ b/tests/spec/glsl-1.30/execution/vertexid-beginend.c @@ -27,7 +27,7 @@ * Test that gl_VertexID has the correct values. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c b/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c index 2c38a3135..9842c7ab5 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c +++ b/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c @@ -27,7 +27,7 @@ * Test that gl_VertexID has the correct values. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/execution/vertexid-drawelements.c b/tests/spec/glsl-1.30/execution/vertexid-drawelements.c index 2f7bed92a..3d254ddec 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-drawelements.c +++ b/tests/spec/glsl-1.30/execution/vertexid-drawelements.c @@ -27,7 +27,7 @@ * Test that gl_VertexID has the correct values. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c index 0bd500551..7ef2a3e38 100644 --- a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c +++ b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c @@ -34,7 +34,7 @@ * contains writes to both variables, even if those writes would never * both occur in the same render. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.30/texel-offset-limits.c b/tests/spec/glsl-1.30/texel-offset-limits.c index e8029508f..25d5974d5 100644 --- a/tests/spec/glsl-1.30/texel-offset-limits.c +++ b/tests/spec/glsl-1.30/texel-offset-limits.c @@ -28,7 +28,7 @@ * Tests that GLSL 1.30 exposes the GL_MIN/MAX_PROGRAM_OFFSET_LIMITS. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.40/tf-no-position.c b/tests/spec/glsl-1.40/tf-no-position.c index c666c50e0..af6b37013 100644 --- a/tests/spec/glsl-1.40/tf-no-position.c +++ b/tests/spec/glsl-1.40/tf-no-position.c @@ -28,7 +28,7 @@ * using EXT_transform_feedback to get results. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BUFFER_SIZE 4 diff --git a/tests/spec/glsl-1.50/execution/geometry/end-primitive.c b/tests/spec/glsl-1.50/execution/geometry/end-primitive.c index 62ad1a1b8..6df3a8929 100644 --- a/tests/spec/glsl-1.50/execution/geometry/end-primitive.c +++ b/tests/spec/glsl-1.50/execution/geometry/end-primitive.c @@ -65,7 +65,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define PATTERN_SIZE 256 diff --git a/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c b/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c index d532a474b..5b8d2d530 100644 --- a/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c +++ b/tests/spec/glsl-1.50/execution/geometry/geometry-end-primitive-optional-with-points-out.c @@ -30,7 +30,7 @@ * is optional." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c b/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c index 788e6b90f..5d8f4ec94 100644 --- a/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c +++ b/tests/spec/glsl-1.50/execution/geometry/getshaderiv-may-return-GS.c @@ -34,7 +34,7 @@ * shader object respectively." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c b/tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c index 45e39ce70..56723d986 100644 --- a/tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c +++ b/tests/spec/glsl-1.50/execution/geometry/gs-emits-too-few-verts.c @@ -28,7 +28,7 @@ * to produce a single primitive, nothing is drawn." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c b/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c index 0b7ba4123..a5e5f903a 100644 --- a/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c +++ b/tests/spec/glsl-1.50/execution/geometry/gs-input-layout-qualifiers.c @@ -35,7 +35,7 @@ * triangles_adjacency" */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c b/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c index 8ce825343..09ad6f047 100644 --- a/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c +++ b/tests/spec/glsl-1.50/execution/geometry/gs-mismatch-prim-type.c @@ -42,7 +42,7 @@ * for the TRIANGLES_ADJACENCY and TRIANGLE_STRIP_ADJACENCY primitive types." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c b/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c index deb9bc359..4f6d5b199 100644 --- a/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c +++ b/tests/spec/glsl-1.50/execution/geometry/gs-output-layout-qualifiers.c @@ -34,7 +34,7 @@ * max_vertices = integer-constant" */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/geometry/primitive-id-restart.c b/tests/spec/glsl-1.50/execution/geometry/primitive-id-restart.c index 4baa4be85..9f1a8efbd 100644 --- a/tests/spec/glsl-1.50/execution/geometry/primitive-id-restart.c +++ b/tests/spec/glsl-1.50/execution/geometry/primitive-id-restart.c @@ -60,7 +60,7 @@ * primitive restart index should be all 0xff's. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/geometry/primitive-types.c b/tests/spec/glsl-1.50/execution/geometry/primitive-types.c index 6a1a8f994..a44f7075d 100644 --- a/tests/spec/glsl-1.50/execution/geometry/primitive-types.c +++ b/tests/spec/glsl-1.50/execution/geometry/primitive-types.c @@ -43,7 +43,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/geometry/query-gs-prim-types.c b/tests/spec/glsl-1.50/execution/geometry/query-gs-prim-types.c index 5f0cb0f86..3f4578bce 100644 --- a/tests/spec/glsl-1.50/execution/geometry/query-gs-prim-types.c +++ b/tests/spec/glsl-1.50/execution/geometry/query-gs-prim-types.c @@ -50,7 +50,7 @@ * a geometry shader, then an INVALID_OPERATION error is generated." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-type-and-size.c b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-type-and-size.c index 07f31cc95..c2b254aa2 100644 --- a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-type-and-size.c +++ b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-type-and-size.c @@ -46,7 +46,7 @@ * declarations in the geometry shader. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; diff --git a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-vertex-id.c b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-vertex-id.c index fef1a173a..5dac18375 100644 --- a/tests/spec/glsl-1.50/execution/geometry/transform-feedback-vertex-id.c +++ b/tests/spec/glsl-1.50/execution/geometry/transform-feedback-vertex-id.c @@ -31,7 +31,7 @@ * feedback is as expected. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 32; diff --git a/tests/spec/glsl-1.50/execution/geometry/tri-strip-ordering-with-prim-restart.c b/tests/spec/glsl-1.50/execution/geometry/tri-strip-ordering-with-prim-restart.c index 48325e324..025bfcacb 100644 --- a/tests/spec/glsl-1.50/execution/geometry/tri-strip-ordering-with-prim-restart.c +++ b/tests/spec/glsl-1.50/execution/geometry/tri-strip-ordering-with-prim-restart.c @@ -58,7 +58,7 @@ * 0xff's. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/get-active-attrib-array.c b/tests/spec/glsl-1.50/execution/get-active-attrib-array.c index 8262ef956..e2d4e64a5 100644 --- a/tests/spec/glsl-1.50/execution/get-active-attrib-array.c +++ b/tests/spec/glsl-1.50/execution/get-active-attrib-array.c @@ -26,7 +26,7 @@ * for arrays of various sizes. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/interface-block-centroid.c b/tests/spec/glsl-1.50/execution/interface-block-centroid.c index 7425cc83e..9c5fd08e2 100644 --- a/tests/spec/glsl-1.50/execution/interface-block-centroid.c +++ b/tests/spec/glsl-1.50/execution/interface-block-centroid.c @@ -38,7 +38,7 @@ * - an interface block array */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/interface-blocks-api-access-members.c b/tests/spec/glsl-1.50/execution/interface-blocks-api-access-members.c index fd3acc0cf..22b62959a 100644 --- a/tests/spec/glsl-1.50/execution/interface-blocks-api-access-members.c +++ b/tests/spec/glsl-1.50/execution/interface-blocks-api-access-members.c @@ -35,7 +35,7 @@ * accessing members" */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-1.50/execution/vs-input-arrays.c b/tests/spec/glsl-1.50/execution/vs-input-arrays.c index 01af54fab..beeb4180e 100644 --- a/tests/spec/glsl-1.50/execution/vs-input-arrays.c +++ b/tests/spec/glsl-1.50/execution/vs-input-arrays.c @@ -43,7 +43,7 @@ * received the expeced 0 from the VS, RED if !0. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_core_version = 32; diff --git a/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c b/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c index 74ea2b256..3f761476e 100644 --- a/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c +++ b/tests/spec/glsl-1.50/execution/vs-named-block-no-modify.c @@ -37,7 +37,7 @@ * block. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glsl-es-3.00/execution/varying-struct-centroid.c b/tests/spec/glsl-es-3.00/execution/varying-struct-centroid.c index 6f6f7ac94..b686bf3d9 100644 --- a/tests/spec/glsl-es-3.00/execution/varying-struct-centroid.c +++ b/tests/spec/glsl-es-3.00/execution/varying-struct-centroid.c @@ -67,7 +67,7 @@ * - Check that all pixels are green. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/glx_arb_create_context/common.c b/tests/spec/glx_arb_create_context/common.c index 7188a6639..eaf35ae68 100644 --- a/tests/spec/glx_arb_create_context/common.c +++ b/tests/spec/glx_arb_create_context/common.c @@ -21,7 +21,7 @@ */ #include <ctype.h> #include <errno.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/current-no-framebuffer.c b/tests/spec/glx_arb_create_context/current-no-framebuffer.c index f5857a25e..a31ce088a 100644 --- a/tests/spec/glx_arb_create_context/current-no-framebuffer.c +++ b/tests/spec/glx_arb_create_context/current-no-framebuffer.c @@ -20,7 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/default-major-version.c b/tests/spec/glx_arb_create_context/default-major-version.c index 07bff27ea..cd9dc5aad 100644 --- a/tests/spec/glx_arb_create_context/default-major-version.c +++ b/tests/spec/glx_arb_create_context/default-major-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/default-minor-version.c b/tests/spec/glx_arb_create_context/default-minor-version.c index f32e99152..9d7af2252 100644 --- a/tests/spec/glx_arb_create_context/default-minor-version.c +++ b/tests/spec/glx_arb_create_context/default-minor-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-attribute.c b/tests/spec/glx_arb_create_context/invalid-attribute.c index 3b7ac36d8..e05a83d57 100644 --- a/tests/spec/glx_arb_create_context/invalid-attribute.c +++ b/tests/spec/glx_arb_create_context/invalid-attribute.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c b/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c index 0e023194d..4665a1f78 100644 --- a/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c +++ b/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-flag.c b/tests/spec/glx_arb_create_context/invalid-flag.c index adae14358..5df4c0146 100644 --- a/tests/spec/glx_arb_create_context/invalid-flag.c +++ b/tests/spec/glx_arb_create_context/invalid-flag.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-gl-version.c b/tests/spec/glx_arb_create_context/invalid-gl-version.c index 501504f25..232043d3a 100644 --- a/tests/spec/glx_arb_create_context/invalid-gl-version.c +++ b/tests/spec/glx_arb_create_context/invalid-gl-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c b/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c index 130222f51..b4252f1b6 100644 --- a/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c +++ b/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-render-type.c b/tests/spec/glx_arb_create_context/invalid-render-type.c index 5ceca05f3..40385728e 100644 --- a/tests/spec/glx_arb_create_context/invalid-render-type.c +++ b/tests/spec/glx_arb_create_context/invalid-render-type.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/valid-attribute-empty.c b/tests/spec/glx_arb_create_context/valid-attribute-empty.c index 22d94a3e8..721871316 100644 --- a/tests/spec/glx_arb_create_context/valid-attribute-empty.c +++ b/tests/spec/glx_arb_create_context/valid-attribute-empty.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/valid-attribute-null.c b/tests/spec/glx_arb_create_context/valid-attribute-null.c index 2ab853a7a..4aec376f5 100644 --- a/tests/spec/glx_arb_create_context/valid-attribute-null.c +++ b/tests/spec/glx_arb_create_context/valid-attribute-null.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c b/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c index 6b3e173d1..eaeffd8d7 100644 --- a/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c +++ b/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/common.c b/tests/spec/glx_ext_import_context/common.c index 9048472b6..00bed7474 100644 --- a/tests/spec/glx_ext_import_context/common.c +++ b/tests/spec/glx_ext_import_context/common.c @@ -21,7 +21,7 @@ */ #include <assert.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/free-context.c b/tests/spec/glx_ext_import_context/free-context.c index 8f1861096..6520d4b84 100644 --- a/tests/spec/glx_ext_import_context/free-context.c +++ b/tests/spec/glx_ext_import_context/free-context.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/get-context-id.c b/tests/spec/glx_ext_import_context/get-context-id.c index 7b78091de..d5df508bf 100644 --- a/tests/spec/glx_ext_import_context/get-context-id.c +++ b/tests/spec/glx_ext_import_context/get-context-id.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/get-current-display.c b/tests/spec/glx_ext_import_context/get-current-display.c index 342aac178..5545f6226 100644 --- a/tests/spec/glx_ext_import_context/get-current-display.c +++ b/tests/spec/glx_ext_import_context/get-current-display.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c b/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c index eb7b70811..fb6e14cb3 100644 --- a/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c +++ b/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/import-context-multi-process.c b/tests/spec/glx_ext_import_context/import-context-multi-process.c index 8ffda55ad..5f758d6a8 100644 --- a/tests/spec/glx_ext_import_context/import-context-multi-process.c +++ b/tests/spec/glx_ext_import_context/import-context-multi-process.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/import-context-single-process.c b/tests/spec/glx_ext_import_context/import-context-single-process.c index 7b4a75918..b854f910b 100644 --- a/tests/spec/glx_ext_import_context/import-context-single-process.c +++ b/tests/spec/glx_ext_import_context/import-context-single-process.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/make-current-multi-process.c b/tests/spec/glx_ext_import_context/make-current-multi-process.c index db93354ec..0f88eaf97 100644 --- a/tests/spec/glx_ext_import_context/make-current-multi-process.c +++ b/tests/spec/glx_ext_import_context/make-current-multi-process.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/make-current-single-process.c b/tests/spec/glx_ext_import_context/make-current-single-process.c index ae15c2b18..0475f4446 100644 --- a/tests/spec/glx_ext_import_context/make-current-single-process.c +++ b/tests/spec/glx_ext_import_context/make-current-single-process.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/query-context-info.c b/tests/spec/glx_ext_import_context/query-context-info.c index 84e225aff..6e187a1fb 100644 --- a/tests/spec/glx_ext_import_context/query-context-info.c +++ b/tests/spec/glx_ext_import_context/query-context-info.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_mesa_query_renderer/coverage.c b/tests/spec/glx_mesa_query_renderer/coverage.c index b3464d4af..b55be164f 100644 --- a/tests/spec/glx_mesa_query_renderer/coverage.c +++ b/tests/spec/glx_mesa_query_renderer/coverage.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "query-renderer-common.h" diff --git a/tests/spec/glx_mesa_query_renderer/query-renderer-common.c b/tests/spec/glx_mesa_query_renderer/query-renderer-common.c index 39dc4c638..c9960a7d2 100644 --- a/tests/spec/glx_mesa_query_renderer/query-renderer-common.c +++ b/tests/spec/glx_mesa_query_renderer/query-renderer-common.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "query-renderer-common.h" diff --git a/tests/spec/glx_oml_sync_control/common.c b/tests/spec/glx_oml_sync_control/common.c index d5011a8d0..58c25c7cb 100644 --- a/tests/spec/glx_oml_sync_control/common.c +++ b/tests/spec/glx_oml_sync_control/common.c @@ -30,7 +30,7 @@ * Support code for running tests of GLX_OML_sync_control. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_oml_sync_control/getmscrate.c b/tests/spec/glx_oml_sync_control/getmscrate.c index c18ea498b..666cee86e 100644 --- a/tests/spec/glx_oml_sync_control/getmscrate.c +++ b/tests/spec/glx_oml_sync_control/getmscrate.c @@ -26,7 +26,7 @@ * Verifies that glXGetMscRateOML returns sensible data. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_oml_sync_control/swapbuffersmsc-divisor-zero.c b/tests/spec/glx_oml_sync_control/swapbuffersmsc-divisor-zero.c index 555f55140..9be7999eb 100644 --- a/tests/spec/glx_oml_sync_control/swapbuffersmsc-divisor-zero.c +++ b/tests/spec/glx_oml_sync_control/swapbuffersmsc-divisor-zero.c @@ -31,7 +31,7 @@ * target MSC is reached. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_oml_sync_control/swapbuffersmsc-return.c b/tests/spec/glx_oml_sync_control/swapbuffersmsc-return.c index 92f34ea20..246f6d4da 100644 --- a/tests/spec/glx_oml_sync_control/swapbuffersmsc-return.c +++ b/tests/spec/glx_oml_sync_control/swapbuffersmsc-return.c @@ -32,7 +32,7 @@ * Catches a bug in the X Server when a swap interval of 0 is used. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_oml_sync_control/waitformsc.c b/tests/spec/glx_oml_sync_control/waitformsc.c index 6fdef6ec0..ee7c9cb70 100644 --- a/tests/spec/glx_oml_sync_control/waitformsc.c +++ b/tests/spec/glx_oml_sync_control/waitformsc.c @@ -31,7 +31,7 @@ * glXGetSyncValuesOML() return a an msc that meet the target. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/khr_debug/debug-object-label.c b/tests/spec/khr_debug/debug-object-label.c index 503dce1f7..151e6849e 100644 --- a/tests/spec/khr_debug/debug-object-label.c +++ b/tests/spec/khr_debug/debug-object-label.c @@ -22,7 +22,7 @@ * SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static const char *TestLabel = "Test Label"; #define TestLabelLen 10 diff --git a/tests/spec/khr_debug/debug-push-pop-group.c b/tests/spec/khr_debug/debug-push-pop-group.c index 2780bba0a..8fa4474c2 100644 --- a/tests/spec/khr_debug/debug-push-pop-group.c +++ b/tests/spec/khr_debug/debug-push-pop-group.c @@ -22,7 +22,7 @@ * SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static const char *TestMessage1 = "Piglit Message 1"; static const char *TestMessage2 = "Piglit Message 2"; diff --git a/tests/spec/nv_conditional_render/begin-while-active.c b/tests/spec/nv_conditional_render/begin-while-active.c index 1272487f0..450bc1bc7 100644 --- a/tests/spec/nv_conditional_render/begin-while-active.c +++ b/tests/spec/nv_conditional_render/begin-while-active.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file begin-while-active.c diff --git a/tests/spec/nv_conditional_render/begin-zero.c b/tests/spec/nv_conditional_render/begin-zero.c index 1d2b472dd..c7b9768c1 100644 --- a/tests/spec/nv_conditional_render/begin-zero.c +++ b/tests/spec/nv_conditional_render/begin-zero.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file begin-zero.c diff --git a/tests/spec/nv_conditional_render/bitmap.c b/tests/spec/nv_conditional_render/bitmap.c index a99c3634f..7f0d4b669 100644 --- a/tests/spec/nv_conditional_render/bitmap.c +++ b/tests/spec/nv_conditional_render/bitmap.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file bitmap.c diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c index 5f16ab40c..cfb98605f 100644 --- a/tests/spec/nv_conditional_render/blitframebuffer.c +++ b/tests/spec/nv_conditional_render/blitframebuffer.c @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file blitframebuffer.c diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c index 71a34b0e0..90a1736a5 100644 --- a/tests/spec/nv_conditional_render/clear.c +++ b/tests/spec/nv_conditional_render/clear.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file clear.c diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c index 5cc71792c..11f6c4772 100644 --- a/tests/spec/nv_conditional_render/copypixels.c +++ b/tests/spec/nv_conditional_render/copypixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file copypixels.c diff --git a/tests/spec/nv_conditional_render/copyteximage.c b/tests/spec/nv_conditional_render/copyteximage.c index cfaab8e5c..b8cd594ec 100644 --- a/tests/spec/nv_conditional_render/copyteximage.c +++ b/tests/spec/nv_conditional_render/copyteximage.c @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file copyteximage.c diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c index dad9871d3..9967a51b5 100644 --- a/tests/spec/nv_conditional_render/copytexsubimage.c +++ b/tests/spec/nv_conditional_render/copytexsubimage.c @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file copytexsubimage.c diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/dlist.c index b0b5308fb..20c018884 100644 --- a/tests/spec/nv_conditional_render/dlist.c +++ b/tests/spec/nv_conditional_render/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file dlist.c diff --git a/tests/spec/nv_conditional_render/drawpixels.c b/tests/spec/nv_conditional_render/drawpixels.c index aefa7529f..9b0ebd439 100644 --- a/tests/spec/nv_conditional_render/drawpixels.c +++ b/tests/spec/nv_conditional_render/drawpixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file drawpixels.c diff --git a/tests/spec/nv_conditional_render/generatemipmap.c b/tests/spec/nv_conditional_render/generatemipmap.c index 7ae96eef1..37585d5fb 100644 --- a/tests/spec/nv_conditional_render/generatemipmap.c +++ b/tests/spec/nv_conditional_render/generatemipmap.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file generatemipmap.c diff --git a/tests/spec/nv_conditional_render/vertex_array.c b/tests/spec/nv_conditional_render/vertex_array.c index 2f6105af4..1208cbd80 100644 --- a/tests/spec/nv_conditional_render/vertex_array.c +++ b/tests/spec/nv_conditional_render/vertex_array.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * @file vertex_array.c diff --git a/tests/spec/nv_texture_barrier/blending-in-shader.c b/tests/spec/nv_texture_barrier/blending-in-shader.c index 3cf47d3f1..e4514c02e 100644 --- a/tests/spec/nv_texture_barrier/blending-in-shader.c +++ b/tests/spec/nv_texture_barrier/blending-in-shader.c @@ -27,7 +27,7 @@ * Test programmable blending with GL_NV_texture_barrier. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c index e1ec1390d..8cb0dba1d 100644 --- a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c +++ b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #ifndef GL_OES_compressed_ETC1_RGB8_texture #define GL_ETC1_RGB8_OES 0x8D64 diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-miptree.c b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-miptree.c index dd573590d..b63049633 100644 --- a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-miptree.c +++ b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-miptree.c @@ -41,7 +41,7 @@ * [2] etcpack is the reference ETC1 compression tool, available at http://devtools.ericsson.com/etc. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit_ktx.h" #define num_levels 7 diff --git a/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c b/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c index 4e6c75da3..d97b9dcef 100644 --- a/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c +++ b/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/oes_draw_texture/oes_draw_texture.c b/tests/spec/oes_draw_texture/oes_draw_texture.c index 2ec22a9a0..27d24d908 100644 --- a/tests/spec/oes_draw_texture/oes_draw_texture.c +++ b/tests/spec/oes_draw_texture/oes_draw_texture.c @@ -30,7 +30,7 @@ #include <EGL/egl.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEXTURE_SIZE 2 diff --git a/tests/spec/oes_fixed_point/oes_fixed_point-attribute-arrays.c b/tests/spec/oes_fixed_point/oes_fixed_point-attribute-arrays.c index 8a3aaee7a..c3a86135d 100644 --- a/tests/spec/oes_fixed_point/oes_fixed_point-attribute-arrays.c +++ b/tests/spec/oes_fixed_point/oes_fixed_point-attribute-arrays.c @@ -32,7 +32,7 @@ * This tests Mesa commit 7a9f4d3e for Intel gen4+. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/spec/oes_matrix_get/api.c b/tests/spec/oes_matrix_get/api.c index 2b537f6f4..f42ff3ee4 100644 --- a/tests/spec/oes_matrix_get/api.c +++ b/tests/spec/oes_matrix_get/api.c @@ -25,7 +25,7 @@ * Test the queries added by GL_OES_matrix_get. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/1-1-linear-texture.c b/tests/texturing/1-1-linear-texture.c index bb658bd26..acaa818a7 100644 --- a/tests/texturing/1-1-linear-texture.c +++ b/tests/texturing/1-1-linear-texture.c @@ -29,7 +29,7 @@ * Tests that the 1:1 texture with filter set to linear is sampled correctly. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/array-depth-roundtrip.c b/tests/texturing/array-depth-roundtrip.c index 445796a0e..e40c88006 100644 --- a/tests/texturing/array-depth-roundtrip.c +++ b/tests/texturing/array-depth-roundtrip.c @@ -42,7 +42,7 @@ * framebuffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEX_WIDTH 56 diff --git a/tests/texturing/array-texture.c b/tests/texturing/array-texture.c index a65d91945..f84116b03 100644 --- a/tests/texturing/array-texture.c +++ b/tests/texturing/array-texture.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/texturing/compressedteximage.c b/tests/texturing/compressedteximage.c index b7697e2e4..96584ce7e 100644 --- a/tests/texturing/compressedteximage.c +++ b/tests/texturing/compressedteximage.c @@ -32,7 +32,7 @@ * glCompressedTexImage2D(). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define SIZE 128 diff --git a/tests/texturing/copyteximage-border.c b/tests/texturing/copyteximage-border.c index 1f7955b71..bdc08773f 100644 --- a/tests/texturing/copyteximage-border.c +++ b/tests/texturing/copyteximage-border.c @@ -27,7 +27,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /* Size of the body of the texture, not counting border. */ #define TEX_SIZE 64 diff --git a/tests/texturing/copyteximage-clipping.c b/tests/texturing/copyteximage-clipping.c index 527a96c6b..9089fb199 100644 --- a/tests/texturing/copyteximage-clipping.c +++ b/tests/texturing/copyteximage-clipping.c @@ -27,7 +27,7 @@ * XXX we should also do some rendering with the texture and check the results. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/copyteximage.c b/tests/texturing/copyteximage.c index 85b22151e..a0f0fa317 100644 --- a/tests/texturing/copyteximage.c +++ b/tests/texturing/copyteximage.c @@ -29,7 +29,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define IMAGE_SIZE 16 static const GLfloat fcolor[8][4] = { diff --git a/tests/texturing/copytexsubimage.c b/tests/texturing/copytexsubimage.c index 505f84b63..cb3c40f54 100644 --- a/tests/texturing/copytexsubimage.c +++ b/tests/texturing/copytexsubimage.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/texturing/crossbar.c b/tests/texturing/crossbar.c index 6a095d723..e10908b53 100644 --- a/tests/texturing/crossbar.c +++ b/tests/texturing/crossbar.c @@ -36,7 +36,7 @@ #include <stdlib.h> #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" static const GLint tests[][8] = { { 1, GL_REPLACE, GL_PRIMARY_COLOR, GL_PRIMARY_COLOR, diff --git a/tests/texturing/cubemap-getteximage-pbo.c b/tests/texturing/cubemap-getteximage-pbo.c index d62eac1e4..d16b3b88b 100644 --- a/tests/texturing/cubemap-getteximage-pbo.c +++ b/tests/texturing/cubemap-getteximage-pbo.c @@ -30,7 +30,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 15; diff --git a/tests/texturing/cubemap-shader.c b/tests/texturing/cubemap-shader.c index 5c0efe80c..049cca2a1 100644 --- a/tests/texturing/cubemap-shader.c +++ b/tests/texturing/cubemap-shader.c @@ -35,7 +35,7 @@ * in the fragment shader. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define PAD 5 diff --git a/tests/texturing/cubemap.c b/tests/texturing/cubemap.c index 83b10fdcf..6d8f06198 100644 --- a/tests/texturing/cubemap.c +++ b/tests/texturing/cubemap.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define PAD 5 diff --git a/tests/texturing/depth-cube-map.c b/tests/texturing/depth-cube-map.c index 5c9e206f4..17a76ba7b 100644 --- a/tests/texturing/depth-cube-map.c +++ b/tests/texturing/depth-cube-map.c @@ -28,7 +28,7 @@ * author: Anuj Phogat */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/depth-level-clamp.c b/tests/texturing/depth-level-clamp.c index bb1daf1c6..e8644878f 100644 --- a/tests/texturing/depth-level-clamp.c +++ b/tests/texturing/depth-level-clamp.c @@ -35,7 +35,7 @@ * miptree copying for relayout that occurs due to the clamping. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define MAX_SIZE 64 #define MAX_LOD 6 diff --git a/tests/texturing/depth-tex-compare.c b/tests/texturing/depth-tex-compare.c index 7f1d616ef..f032f8451 100644 --- a/tests/texturing/depth-tex-compare.c +++ b/tests/texturing/depth-tex-compare.c @@ -31,7 +31,7 @@ * clear color (green) using the alpha value. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define BOX_SIZE 24 diff --git a/tests/texturing/depth-tex-modes-common.c b/tests/texturing/depth-tex-modes-common.c index c57c8c864..fbabfe243 100644 --- a/tests/texturing/depth-tex-modes-common.c +++ b/tests/texturing/depth-tex-modes-common.c @@ -29,7 +29,7 @@ * \author Ian Romanick */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "depth-tex-modes-common.h" static void loadTex(void); diff --git a/tests/texturing/depth-tex-modes-glsl.c b/tests/texturing/depth-tex-modes-glsl.c index b2d821f6f..ccdf5ef5c 100644 --- a/tests/texturing/depth-tex-modes-glsl.c +++ b/tests/texturing/depth-tex-modes-glsl.c @@ -28,7 +28,7 @@ * INTENSITY, and ALPHA with programmable shaders. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/depth-tex-modes-rg.c b/tests/texturing/depth-tex-modes-rg.c index 61ab560f8..9b1dcfbdc 100644 --- a/tests/texturing/depth-tex-modes-rg.c +++ b/tests/texturing/depth-tex-modes-rg.c @@ -28,7 +28,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "depth-tex-modes-common.h" static const GLenum depth_texture_modes[] = { diff --git a/tests/texturing/depth-tex-modes.c b/tests/texturing/depth-tex-modes.c index 5d6d530f7..ce7ed503a 100644 --- a/tests/texturing/depth-tex-modes.c +++ b/tests/texturing/depth-tex-modes.c @@ -28,7 +28,7 @@ * textures and texture rectangles. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "depth-tex-modes-common.h" static const GLenum depth_texture_modes[] = { diff --git a/tests/texturing/depthstencil-render-miplevels.cpp b/tests/texturing/depthstencil-render-miplevels.cpp index 4f57e098e..3f182f8e5 100644 --- a/tests/texturing/depthstencil-render-miplevels.cpp +++ b/tests/texturing/depthstencil-render-miplevels.cpp @@ -84,7 +84,7 @@ * bound to the same buffer. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/fragment-and-vertex-texturing.c b/tests/texturing/fragment-and-vertex-texturing.c index 0ffe25a4f..e859c435e 100644 --- a/tests/texturing/fragment-and-vertex-texturing.c +++ b/tests/texturing/fragment-and-vertex-texturing.c @@ -30,7 +30,7 @@ */ #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/fxt1-teximage.c b/tests/texturing/fxt1-teximage.c index a40c1a525..bf4d4d8c5 100644 --- a/tests/texturing/fxt1-teximage.c +++ b/tests/texturing/fxt1-teximage.c @@ -32,7 +32,7 @@ * and used. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/gen-compressed-teximage.c b/tests/texturing/gen-compressed-teximage.c index 1b4463fa5..c9393bf59 100644 --- a/tests/texturing/gen-compressed-teximage.c +++ b/tests/texturing/gen-compressed-teximage.c @@ -36,7 +36,7 @@ * existing texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/gen-nonzero-unit.c b/tests/texturing/gen-nonzero-unit.c index 9e998941e..5b625008b 100644 --- a/tests/texturing/gen-nonzero-unit.c +++ b/tests/texturing/gen-nonzero-unit.c @@ -39,7 +39,7 @@ * existing texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/gen-teximage.c b/tests/texturing/gen-teximage.c index 326d8441a..4827c8540 100644 --- a/tests/texturing/gen-teximage.c +++ b/tests/texturing/gen-teximage.c @@ -36,7 +36,7 @@ * existing texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/gen-texsubimage.c b/tests/texturing/gen-texsubimage.c index 609638888..b7a6a5afc 100644 --- a/tests/texturing/gen-texsubimage.c +++ b/tests/texturing/gen-texsubimage.c @@ -33,7 +33,7 @@ * in bug #17077. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/getteximage-formats.c b/tests/texturing/getteximage-formats.c index 32d945563..1fbbdfd8d 100644 --- a/tests/texturing/getteximage-formats.c +++ b/tests/texturing/getteximage-formats.c @@ -32,7 +32,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "../fbo/fbo-formats.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/getteximage-luminance.c b/tests/texturing/getteximage-luminance.c index 389c3a269..75c7744e5 100644 --- a/tests/texturing/getteximage-luminance.c +++ b/tests/texturing/getteximage-luminance.c @@ -28,7 +28,7 @@ * 8 Mar 2012 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/getteximage-simple.c b/tests/texturing/getteximage-simple.c index c63eacc2c..7971583c8 100644 --- a/tests/texturing/getteximage-simple.c +++ b/tests/texturing/getteximage-simple.c @@ -10,7 +10,7 @@ * This used to crash for R300+bufmgr. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/getteximage-targets.c b/tests/texturing/getteximage-targets.c index 3148ba744..f6e512033 100644 --- a/tests/texturing/getteximage-targets.c +++ b/tests/texturing/getteximage-targets.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/texturing/incomplete-texture.c b/tests/texturing/incomplete-texture.c index 07fe56838..8b97c4c7d 100644 --- a/tests/texturing/incomplete-texture.c +++ b/tests/texturing/incomplete-texture.c @@ -29,7 +29,7 @@ * Oct 2011 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/levelclamp.c b/tests/texturing/levelclamp.c index eda5173de..bb769850a 100644 --- a/tests/texturing/levelclamp.c +++ b/tests/texturing/levelclamp.c @@ -30,7 +30,7 @@ * GL_TEXTURE_MAX_LEVEL work on a mipmapped 2D texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define MAX_SIZE 32 #define MAX_LEVEL 5 diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c index e99f31641..83cb031fc 100644 --- a/tests/texturing/lodbias.c +++ b/tests/texturing/lodbias.c @@ -40,7 +40,7 @@ * Check clamping behaviour. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define SquareSize 50 diff --git a/tests/texturing/lodclamp-between-max.c b/tests/texturing/lodclamp-between-max.c index 12080d2ae..09694c08c 100644 --- a/tests/texturing/lodclamp-between-max.c +++ b/tests/texturing/lodclamp-between-max.c @@ -32,7 +32,7 @@ * results in appropriate mipmap filtering. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define MAX_SIZE 32 #define MAX_LOD 5 diff --git a/tests/texturing/lodclamp-between.c b/tests/texturing/lodclamp-between.c index 787e6012c..fe5736753 100644 --- a/tests/texturing/lodclamp-between.c +++ b/tests/texturing/lodclamp-between.c @@ -32,7 +32,7 @@ * appropriate mipmap filtering. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define MAX_SIZE 32 #define MAX_LOD 5 diff --git a/tests/texturing/lodclamp.c b/tests/texturing/lodclamp.c index e2beb7b65..a5ee4751b 100644 --- a/tests/texturing/lodclamp.c +++ b/tests/texturing/lodclamp.c @@ -30,7 +30,7 @@ * GL_TEXTURE_MAX_LOD work on a mipmapped 2D texture. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define MAX_SIZE 32 #define MAX_LOD 5 diff --git a/tests/texturing/max-samplers.c b/tests/texturing/max-samplers.c index 3c979f4d1..52d0a2ceb 100644 --- a/tests/texturing/max-samplers.c +++ b/tests/texturing/max-samplers.c @@ -28,7 +28,7 @@ */ #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/max-texture-size-level.c b/tests/texturing/max-texture-size-level.c index f1c1617ed..23a7b8384 100644 --- a/tests/texturing/max-texture-size-level.c +++ b/tests/texturing/max-texture-size-level.c @@ -36,7 +36,7 @@ * TEXTURE SIZE." */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/max-texture-size.c b/tests/texturing/max-texture-size.c index 45e01c98f..8afa9ef65 100644 --- a/tests/texturing/max-texture-size.c +++ b/tests/texturing/max-texture-size.c @@ -41,7 +41,7 @@ * \Author Anuj Phogat <anuj.phogat@gmail.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define COLOR_COMPONENTS 4 /*GL_RGBA*/ PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/mipmap-setup.c b/tests/texturing/mipmap-setup.c index d36f3b3ef..4c5cee55b 100644 --- a/tests/texturing/mipmap-setup.c +++ b/tests/texturing/mipmap-setup.c @@ -31,7 +31,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/proxy-texture.c b/tests/texturing/proxy-texture.c index 530170920..6a4d0228e 100644 --- a/tests/texturing/proxy-texture.c +++ b/tests/texturing/proxy-texture.c @@ -27,7 +27,7 @@ * \author Brian Paul */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/rg-draw-pixels.c b/tests/texturing/rg-draw-pixels.c index e7022da01..efc89513a 100644 --- a/tests/texturing/rg-draw-pixels.c +++ b/tests/texturing/rg-draw-pixels.c @@ -28,7 +28,7 @@ * and GL_RG and tests for the correct color output. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/rg-teximage-01.c b/tests/texturing/rg-teximage-01.c index 07f46a58d..72632eb2f 100644 --- a/tests/texturing/rg-teximage-01.c +++ b/tests/texturing/rg-teximage-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" #include "rg-teximage-common.h" #define WIDTH 256 diff --git a/tests/texturing/rg-teximage-02.c b/tests/texturing/rg-teximage-02.c index 776ed1942..28746beb0 100644 --- a/tests/texturing/rg-teximage-02.c +++ b/tests/texturing/rg-teximage-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" #include "rg-teximage-common.h" #define WIDTH 256 diff --git a/tests/texturing/rg-teximage-common.c b/tests/texturing/rg-teximage-common.c index 1c1a3833e..2aba92eab 100644 --- a/tests/texturing/rg-teximage-common.c +++ b/tests/texturing/rg-teximage-common.c @@ -32,7 +32,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "rg-teximage-common.h" /** diff --git a/tests/texturing/rgtc-teximage-01.c b/tests/texturing/rgtc-teximage-01.c index 12bd35f6c..5a91c72b6 100644 --- a/tests/texturing/rgtc-teximage-01.c +++ b/tests/texturing/rgtc-teximage-01.c @@ -33,7 +33,7 @@ * Modified by Dave Airlie for RGTC */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "rg-teximage-common.h" #define WIDTH 256 diff --git a/tests/texturing/rgtc-teximage-02.c b/tests/texturing/rgtc-teximage-02.c index 945b99909..255f34bec 100644 --- a/tests/texturing/rgtc-teximage-02.c +++ b/tests/texturing/rgtc-teximage-02.c @@ -33,7 +33,7 @@ * modified by Dave Airlie for RGTC */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "rg-teximage-common.h" #define WIDTH 256 diff --git a/tests/texturing/s3tc-errors.c b/tests/texturing/s3tc-errors.c index 45403d228..0ed12798f 100644 --- a/tests/texturing/s3tc-errors.c +++ b/tests/texturing/s3tc-errors.c @@ -32,7 +32,7 @@ * Sep 20, 2012 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/s3tc-teximage.c b/tests/texturing/s3tc-teximage.c index 3043df6e9..6256c0acd 100644 --- a/tests/texturing/s3tc-teximage.c +++ b/tests/texturing/s3tc-teximage.c @@ -32,7 +32,7 @@ * used. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/s3tc-texsubimage.c b/tests/texturing/s3tc-texsubimage.c index c1e32d675..ddb9a98c1 100644 --- a/tests/texturing/s3tc-texsubimage.c +++ b/tests/texturing/s3tc-texsubimage.c @@ -32,7 +32,7 @@ * used. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/sampler-cube-shadow.c b/tests/texturing/sampler-cube-shadow.c index f2a6c7c2a..2702c057f 100644 --- a/tests/texturing/sampler-cube-shadow.c +++ b/tests/texturing/sampler-cube-shadow.c @@ -32,7 +32,7 @@ * reference value ('q'texture coordinate) */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/shaders/common.h b/tests/texturing/shaders/common.h index a4d1dc099..49f38e8b5 100644 --- a/tests/texturing/shaders/common.h +++ b/tests/texturing/shaders/common.h @@ -27,7 +27,7 @@ * Common structures and functions used for GLSL 1.30+ texturing tests. */ #pragma once -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /** * Texture miplevel info: diff --git a/tests/texturing/shaders/textureGather.c b/tests/texturing/shaders/textureGather.c index bd48790a5..4e439ce3e 100644 --- a/tests/texturing/shaders/textureGather.c +++ b/tests/texturing/shaders/textureGather.c @@ -1,4 +1,4 @@ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/sized-texture-format-channels.c b/tests/texturing/sized-texture-format-channels.c index 1e4ad1351..a8a78e030 100644 --- a/tests/texturing/sized-texture-format-channels.c +++ b/tests/texturing/sized-texture-format-channels.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "sized-internalformats.h" /** diff --git a/tests/texturing/streaming-texture-leak.c b/tests/texturing/streaming-texture-leak.c index 46ad595b3..202bbe075 100644 --- a/tests/texturing/streaming-texture-leak.c +++ b/tests/texturing/streaming-texture-leak.c @@ -36,7 +36,7 @@ * Bug #23530 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/tex-border-1.c b/tests/texturing/tex-border-1.c index c4dd3c77c..b0ea81e21 100644 --- a/tests/texturing/tex-border-1.c +++ b/tests/texturing/tex-border-1.c @@ -37,7 +37,7 @@ * border colors.). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/tex-miplevel-selection.c b/tests/texturing/tex-miplevel-selection.c index aff8e52de..0f03c6ee4 100644 --- a/tests/texturing/tex-miplevel-selection.c +++ b/tests/texturing/tex-miplevel-selection.c @@ -54,7 +54,7 @@ * value lies in between, the test passes. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/tex-skipped-unit.c b/tests/texturing/tex-skipped-unit.c index 8355f4148..c5913f7ed 100644 --- a/tests/texturing/tex-skipped-unit.c +++ b/tests/texturing/tex-skipped-unit.c @@ -26,7 +26,7 @@ * Test of ATI_envmap_bumpmap texture combiners. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define TEXSIZE 32 diff --git a/tests/texturing/tex-srgb.c b/tests/texturing/tex-srgb.c index a47dc30f5..2c706d51c 100644 --- a/tests/texturing/tex-srgb.c +++ b/tests/texturing/tex-srgb.c @@ -30,7 +30,7 @@ * Check srgb texturing and EXT_texture_sRGB_decode */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/tex3d-depth1.c b/tests/texturing/tex3d-depth1.c index 709c3fd4f..55633c824 100644 --- a/tests/texturing/tex3d-depth1.c +++ b/tests/texturing/tex3d-depth1.c @@ -30,7 +30,7 @@ * 28 Aug 2012 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c index 06af1c4cb..114ccb606 100644 --- a/tests/texturing/tex3d-maxsize.c +++ b/tests/texturing/tex3d-maxsize.c @@ -26,7 +26,7 @@ * Tests 3D textures. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/tex3d-npot.c b/tests/texturing/tex3d-npot.c index 6911521e6..b312edb77 100644 --- a/tests/texturing/tex3d-npot.c +++ b/tests/texturing/tex3d-npot.c @@ -26,7 +26,7 @@ * Tests 3D textures. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c index 0dd72fce7..bac8eefdd 100644 --- a/tests/texturing/tex3d.c +++ b/tests/texturing/tex3d.c @@ -26,7 +26,7 @@ * Tests 3D textures. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/texdepth.c b/tests/texturing/texdepth.c index 14f4ee87f..43c889c13 100644 --- a/tests/texturing/texdepth.c +++ b/tests/texturing/texdepth.c @@ -8,7 +8,7 @@ * - EXT_shadow_funcs */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #define ROWS 4 #define COLS 8 diff --git a/tests/texturing/teximage-errors.c b/tests/texturing/teximage-errors.c index 119851498..1c9fe144b 100644 --- a/tests/texturing/teximage-errors.c +++ b/tests/texturing/teximage-errors.c @@ -27,7 +27,7 @@ * Tests glTexImage functions for invalid values, error reporting. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c index b4c75fa14..3f34a25b8 100644 --- a/tests/texturing/texrect-many.c +++ b/tests/texturing/texrect-many.c @@ -6,7 +6,7 @@ * (Prompted by a bug in R300 where the driver ran out of indirections). */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/texredefine.c b/tests/texturing/texredefine.c index e9752a218..65754b02e 100644 --- a/tests/texturing/texredefine.c +++ b/tests/texturing/texredefine.c @@ -29,7 +29,7 @@ #include <stdarg.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/texsubimage.c b/tests/texturing/texsubimage.c index fec9aa4c0..f5b9209bf 100644 --- a/tests/texturing/texsubimage.c +++ b/tests/texturing/texsubimage.c @@ -32,7 +32,7 @@ */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "../fbo/fbo-formats.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/texture-al.c b/tests/texturing/texture-al.c index d33bb6b51..7a86d4270 100644 --- a/tests/texturing/texture-al.c +++ b/tests/texturing/texture-al.c @@ -29,7 +29,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=34280 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/texture-packed-formats.c b/tests/texturing/texture-packed-formats.c index add88d302..4ef3bd881 100644 --- a/tests/texturing/texture-packed-formats.c +++ b/tests/texturing/texture-packed-formats.c @@ -37,7 +37,7 @@ #include <stdlib.h> #include <math.h> #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/texture-rg.c b/tests/texturing/texture-rg.c index 80d6f883c..d592ca21d 100644 --- a/tests/texturing/texture-rg.c +++ b/tests/texturing/texture-rg.c @@ -27,7 +27,7 @@ * Tests GL_ARB_texture_rg extension (red/green texture formats) */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" PIGLIT_GL_TEST_CONFIG_BEGIN diff --git a/tests/texturing/texwrap.c b/tests/texturing/texwrap.c index 383681ebb..b9eda265f 100644 --- a/tests/texturing/texwrap.c +++ b/tests/texturing/texwrap.c @@ -62,7 +62,7 @@ * 2D GL_RGBA8 */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <limits.h> /* Only *_ARB versions of these exist. I am lazy to add the suffix. */ diff --git a/tests/util/minmax-test.c b/tests/util/minmax-test.c index 949356a68..dc63c682a 100644 --- a/tests/util/minmax-test.c +++ b/tests/util/minmax-test.c @@ -29,7 +29,7 @@ #include <inttypes.h> #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "minmax-test.h" bool piglit_minmax_pass = true; diff --git a/tests/util/piglit-dispatch-init.c b/tests/util/piglit-dispatch-init.c index 456f75b30..b27330e2e 100644 --- a/tests/util/piglit-dispatch-init.c +++ b/tests/util/piglit-dispatch-init.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #if defined(_WIN32) diff --git a/tests/util/piglit-dispatch.c b/tests/util/piglit-dispatch.c index bf5c633ff..4c5c956fa 100644 --- a/tests/util/piglit-dispatch.c +++ b/tests/util/piglit-dispatch.c @@ -21,7 +21,7 @@ */ #include "piglit-dispatch.h" -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #if defined(PIGLIT_USE_WAFFLE) #include <waffle.h> diff --git a/tests/util/piglit-fbo.h b/tests/util/piglit-fbo.h index 17acf4ed6..256410286 100644 --- a/tests/util/piglit-fbo.h +++ b/tests/util/piglit-fbo.h @@ -26,7 +26,7 @@ * test's requirements. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "math.h" namespace piglit_util_fbo { diff --git a/tests/util/piglit-framework-gl.c b/tests/util/piglit-framework-gl.c index a97babce5..6a1c201e0 100644 --- a/tests/util/piglit-framework-gl.c +++ b/tests/util/piglit-framework-gl.c @@ -27,7 +27,7 @@ #include <stdlib.h> #include <math.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-framework-gl/piglit_gl_framework.h" struct piglit_gl_framework *gl_fw; diff --git a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c index 70b4eb047..44fd0d1f7 100644 --- a/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c +++ b/tests/util/piglit-framework-gl/piglit_drm_dma_buf.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit_drm_dma_buf.h" #ifdef HAVE_LIBDRM_INTEL #include <libdrm/intel_bufmgr.h> diff --git a/tests/util/piglit-framework-gl/piglit_fbo_framework.c b/tests/util/piglit-framework-gl/piglit_fbo_framework.c index 0338bb1b9..8f4a19df2 100644 --- a/tests/util/piglit-framework-gl/piglit_fbo_framework.c +++ b/tests/util/piglit-framework-gl/piglit_fbo_framework.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-waffle.h" #include "piglit_fbo_framework.h" diff --git a/tests/util/piglit-framework-gl/piglit_gbm_framework.c b/tests/util/piglit-framework-gl/piglit_gbm_framework.c index 859a7c92d..3ea2a167b 100644 --- a/tests/util/piglit-framework-gl/piglit_gbm_framework.c +++ b/tests/util/piglit-framework-gl/piglit_gbm_framework.c @@ -25,7 +25,7 @@ #include <stdlib.h> #include <unistd.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit_gbm_framework.h" static void diff --git a/tests/util/piglit-framework-gl/piglit_gl_framework.c b/tests/util/piglit-framework-gl/piglit_gl_framework.c index 133c1dc40..845baa14c 100644 --- a/tests/util/piglit-framework-gl/piglit_gl_framework.c +++ b/tests/util/piglit-framework-gl/piglit_gl_framework.c @@ -24,9 +24,9 @@ #include <stdio.h> #include <string.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit_gl_framework.h" -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #ifdef PIGLIT_USE_WAFFLE # include "piglit_fbo_framework.h" diff --git a/tests/util/piglit-framework-gl/piglit_glut_framework.c b/tests/util/piglit-framework-gl/piglit_glut_framework.c index 75b8fa635..b10ee1c9c 100644 --- a/tests/util/piglit-framework-gl/piglit_glut_framework.c +++ b/tests/util/piglit-framework-gl/piglit_glut_framework.c @@ -27,7 +27,7 @@ #include <string.h> #include "piglit_glut_framework.h" -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" struct piglit_glut_framework { struct piglit_gl_framework gl_fw; diff --git a/tests/util/piglit-framework-gl/piglit_wfl_framework.c b/tests/util/piglit-framework-gl/piglit_wfl_framework.c index 818625be5..2fb2f619c 100644 --- a/tests/util/piglit-framework-gl/piglit_wfl_framework.c +++ b/tests/util/piglit-framework-gl/piglit_wfl_framework.c @@ -23,7 +23,7 @@ #include <stdio.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-waffle.h" #include "piglit_wfl_framework.h" diff --git a/tests/util/piglit-framework-gl/piglit_winsys_framework.c b/tests/util/piglit-framework-gl/piglit_winsys_framework.c index 7aff1ae13..62d7cb567 100644 --- a/tests/util/piglit-framework-gl/piglit_winsys_framework.c +++ b/tests/util/piglit-framework-gl/piglit_winsys_framework.c @@ -24,7 +24,7 @@ #include <assert.h> #include <unistd.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-waffle.h" #include "piglit_gbm_framework.h" diff --git a/tests/util/piglit-framework-gl/piglit_wl_framework.c b/tests/util/piglit-framework-gl/piglit_wl_framework.c index 253157474..78ffea6f3 100644 --- a/tests/util/piglit-framework-gl/piglit_wl_framework.c +++ b/tests/util/piglit-framework-gl/piglit_wl_framework.c @@ -25,7 +25,7 @@ #include <stdlib.h> #include <unistd.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit_wl_framework.h" static void diff --git a/tests/util/piglit-framework-gl/piglit_x11_framework.c b/tests/util/piglit-framework-gl/piglit_x11_framework.c index 8b3d3d79b..8ea7b3ac4 100644 --- a/tests/util/piglit-framework-gl/piglit_x11_framework.c +++ b/tests/util/piglit-framework-gl/piglit_x11_framework.c @@ -53,7 +53,7 @@ # include <waffle_x11_egl.h> #endif -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit_gl_framework.h" #include "piglit_x11_framework.h" diff --git a/tests/util/piglit-glx-framework.c b/tests/util/piglit-glx-framework.c index 4fed48a1e..29420d957 100644 --- a/tests/util/piglit-glx-framework.c +++ b/tests/util/piglit-glx-framework.c @@ -25,6 +25,6 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" int piglit_automatic = 0; diff --git a/tests/util/piglit-glx-util.c b/tests/util/piglit-glx-util.c index 38056189d..39a6abb10 100644 --- a/tests/util/piglit-glx-util.c +++ b/tests/util/piglit-glx-util.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-glx-util.h" int piglit_automatic; diff --git a/tests/util/piglit-shader.c b/tests/util/piglit-shader.c index 1f20a8ea7..0980fa96b 100644 --- a/tests/util/piglit-shader.c +++ b/tests/util/piglit-shader.c @@ -23,7 +23,7 @@ #include <errno.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" void piglit_get_glsl_version(bool *es, int* major, int* minor) { diff --git a/tests/util/piglit-test-pattern.h b/tests/util/piglit-test-pattern.h index 77cde7356..0ccf350c7 100644 --- a/tests/util/piglit-test-pattern.h +++ b/tests/util/piglit-test-pattern.h @@ -26,7 +26,7 @@ * test patterns in to color, depth or stencil buffers. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "math.h" namespace piglit_util_test_pattern diff --git a/tests/util/piglit-util-gl-common.c b/tests/util/piglit-util-gl-common.c index 59c406823..1a8ee1883 100644 --- a/tests/util/piglit-util-gl-common.c +++ b/tests/util/piglit-util-gl-common.c @@ -21,7 +21,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include <ctype.h> #define BUFFER_OFFSET(i) ((char *)NULL + (i)) diff --git a/tests/util/piglit-util-gl-enum-gen.c.mako b/tests/util/piglit-util-gl-enum-gen.c.mako index 3bf007c4f..e22a75d2d 100644 --- a/tests/util/piglit-util-gl-enum-gen.c.mako +++ b/tests/util/piglit-util-gl-enum-gen.c.mako @@ -24,7 +24,7 @@ */ <%block filter='fake_whitespace'>\ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" const char* piglit_get_gl_enum_name(GLenum param) diff --git a/tests/util/piglit-util-gl-common.h b/tests/util/piglit-util-gl.h index 73009f554..73b658e7a 100644 --- a/tests/util/piglit-util-gl-common.h +++ b/tests/util/piglit-util-gl.h @@ -22,8 +22,8 @@ */ #pragma once -#ifndef PIGLIT_UTIL_GL_COMMON_H -#define PIGLIT_UTIL_GL_COMMON_H +#ifndef __PIGLIT_UTIL_GL_H__ +#define __PIGLIT_UTIL_GL_H__ #ifdef __cplusplus extern "C" { @@ -266,4 +266,4 @@ required_gl_version_from_glsl_version(unsigned glsl_version); } /* end extern "C" */ #endif -#endif /* PIGLIT_UTIL_GL_COMMON_H */ +#endif /* __PIGLIT_UTIL_GL_H__ */ diff --git a/tests/util/piglit-util-waffle.c b/tests/util/piglit-util-waffle.c index b1ad0a240..29b4cb281 100644 --- a/tests/util/piglit-util-waffle.c +++ b/tests/util/piglit-util-waffle.c @@ -24,7 +24,7 @@ #include <assert.h> #include <stdio.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-util-waffle.h" static void diff --git a/tests/util/piglit-vbo.cpp b/tests/util/piglit-vbo.cpp index 109cef91c..8a6ef90fe 100644 --- a/tests/util/piglit-vbo.cpp +++ b/tests/util/piglit-vbo.cpp @@ -91,7 +91,7 @@ #include <errno.h> #include <ctype.h> -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "piglit-vbo.h" /** diff --git a/tests/util/piglit_ktx.c b/tests/util/piglit_ktx.c index 0dc1fdf95..d6c923190 100644 --- a/tests/util/piglit_ktx.c +++ b/tests/util/piglit_ktx.c @@ -27,7 +27,7 @@ #include <string.h> #include "piglit_ktx.h" -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" /* FIXME: Remove #defines when piglit-dispatch gains support for GLES. */ #define GL_TEXTURE_1D 0x0DE0 diff --git a/tests/util/r11g11b10f.c b/tests/util/r11g11b10f.c index 4fc3901a9..60424c13a 100644 --- a/tests/util/r11g11b10f.c +++ b/tests/util/r11g11b10f.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "r11g11b10f.h" #include <math.h> #include <assert.h> diff --git a/tests/util/sized-internalformats.c b/tests/util/sized-internalformats.c index ae949c7d1..d3d71e17d 100644 --- a/tests/util/sized-internalformats.c +++ b/tests/util/sized-internalformats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util-gl-common.h" +#include "piglit-util-gl.h" #include "sized-internalformats.h" #define FORMAT(token, r, g, b, a, l, i, d, s) \ |