[Piglit] [PATCH 09/23] tests: Remove direct includes of piglit-framework.h
Chad Versace
chad.versace at linux.intel.com
Fri Sep 28 10:44:55 PDT 2012
This prepares for the next commit, which renames piglit-framework.h. All
modified files included piglit-framework.h transitively.
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
tests/bugs/fdo24066.c | 1 -
tests/bugs/point-sprite.c | 1 -
tests/bugs/r300-readcache.c | 1 -
tests/bugs/tex1d-2dborder.c | 1 -
tests/bugs/vbo-buffer-unmap.c | 1 -
tests/fbo/fbo-draw-buffers-blend.c | 1 -
tests/fbo/fbo-flushing-2.c | 1 -
tests/fbo/fbo-flushing.c | 1 -
tests/fbo/fbo-fragcoord2.c | 1 -
tests/fbo/fbo-scissor-bitmap.c | 1 -
tests/fbo/fbo-storage-completeness.c | 1 -
tests/fbo/fbo-storage-formats.c | 1 -
tests/fbo/fbo-viewport.c | 1 -
tests/general/array-stride.c | 1 -
tests/general/copy-pixels.c | 1 -
tests/general/copypixels-draw-sync.c | 1 -
tests/general/copypixels-sync.c | 1 -
tests/general/depthfunc.c | 1 -
tests/general/dlist-fdo3129-01.c | 1 -
tests/general/dlist-fdo3129-02.c | 1 -
tests/general/dlist-fdo31590.c | 1 -
tests/general/draw-copypixels-sync.c | 1 -
tests/general/draw-sync.c | 1 -
tests/general/fog-modes.c | 1 -
tests/general/gl30basic.c | 1 -
tests/general/hiz.c | 1 -
tests/general/isbufferobj.c | 1 -
tests/general/longprim.c | 1 -
tests/general/roundmode-getintegerv.c | 1 -
tests/general/roundmode-pixelstore.c | 1 -
tests/general/scissor-bitmap.c | 1 -
tests/general/select.c | 1 -
tests/general/user-clip.c | 1 -
tests/gles2/gles2_shader_runner.c | 1 -
tests/shaders/fp-abs-01.c | 1 -
tests/shaders/fp-abs-02.c | 1 -
tests/shaders/fp-condition_codes-01.c | 1 -
tests/shaders/fp-formats.c | 1 -
tests/shaders/fp-indirections2.c | 1 -
tests/shaders/fp-long-alu.c | 1 -
tests/shaders/fp-rfl.c | 1 -
tests/shaders/fp-set-01.c | 1 -
tests/shaders/fp-set-02.c | 1 -
tests/shaders/fp-unpack-01.c | 1 -
tests/shaders/getuniform-01.c | 1 -
tests/shaders/getuniform-02.c | 1 -
tests/shaders/glsl-bindattriblocation.c | 1 -
tests/shaders/glsl-dlist-getattriblocation.c | 1 -
tests/shaders/glsl-getattriblocation.c | 1 -
tests/shaders/glsl-max-vertex-attrib.c | 1 -
tests/shaders/glsl-novertexdata.c | 1 -
tests/shaders/glsl-reload-source.c | 1 -
tests/shaders/glsl-uniform-out-of-bounds.c | 1 -
tests/shaders/glsl-uniform-update.c | 1 -
tests/shaders/vp-address-01.c | 1 -
tests/shaders/vp-address-02.c | 1 -
tests/shaders/vp-address-03.c | 1 -
tests/shaders/vp-address-04.c | 1 -
tests/shaders/vp-address-05.c | 1 -
tests/shaders/vp-address-06.c | 1 -
tests/shaders/vp-clipdistance-01.c | 1 -
tests/shaders/vp-clipdistance-02.c | 1 -
tests/shaders/vp-clipdistance-03.c | 1 -
tests/shaders/vp-clipdistance-04.c | 1 -
tests/shaders/vp-max-array.c | 1 -
.../spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c | 1 -
tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c | 1 -
tests/spec/arb_sampler_objects/framebufferblit.c | 1 -
tests/spec/arb_sampler_objects/sampler-incomplete.c | 1 -
tests/spec/arb_sampler_objects/sampler-objects.c | 1 -
tests/spec/arb_sampler_objects/srgb-decode.c | 1 -
tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c | 1 -
tests/spec/ati_envmap_bumpmap/bump.c | 1 -
tests/spec/ext_fog_coord/modes.c | 1 -
tests/texturing/depth-tex-compare.c | 1 -
tests/texturing/depth-tex-modes-rg.c | 1 -
tests/texturing/depth-tex-modes.c | 1 -
tests/texturing/lodbias.c | 1 -
tests/texturing/mipmap-setup.c | 1 -
tests/texturing/rg-draw-pixels.c | 1 -
tests/texturing/rg-teximage-01.c | 1 -
tests/texturing/rg-teximage-02.c | 1 -
tests/texturing/rg-teximage-common.c | 1 -
tests/texturing/rgtc-teximage-01.c | 1 -
tests/texturing/rgtc-teximage-02.c | 1 -
tests/texturing/tex-skipped-unit.c | 1 -
86 files changed, 86 deletions(-)
diff --git a/tests/bugs/fdo24066.c b/tests/bugs/fdo24066.c
index d0fc375..b321896 100644
--- a/tests/bugs/fdo24066.c
+++ b/tests/bugs/fdo24066.c
@@ -33,7 +33,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
16 /*window_width*/,
diff --git a/tests/bugs/point-sprite.c b/tests/bugs/point-sprite.c
index 1b429d5..08c3560 100644
--- a/tests/bugs/point-sprite.c
+++ b/tests/bugs/point-sprite.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#define BOX_SIZE 64
#define TEST_COLS 6
diff --git a/tests/bugs/r300-readcache.c b/tests/bugs/r300-readcache.c
index 4982c1c..3461e4a 100644
--- a/tests/bugs/r300-readcache.c
+++ b/tests/bugs/r300-readcache.c
@@ -16,7 +16,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/bugs/tex1d-2dborder.c b/tests/bugs/tex1d-2dborder.c
index be0cebc..f2bcc1d 100644
--- a/tests/bugs/tex1d-2dborder.c
+++ b/tests/bugs/tex1d-2dborder.c
@@ -31,7 +31,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
256 /*window_width*/,
diff --git a/tests/bugs/vbo-buffer-unmap.c b/tests/bugs/vbo-buffer-unmap.c
index b5e9700..0c13f70 100644
--- a/tests/bugs/vbo-buffer-unmap.c
+++ b/tests/bugs/vbo-buffer-unmap.c
@@ -31,7 +31,6 @@
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/fbo/fbo-draw-buffers-blend.c b/tests/fbo/fbo-draw-buffers-blend.c
index 30da329..60a54ad 100644
--- a/tests/fbo/fbo-draw-buffers-blend.c
+++ b/tests/fbo/fbo-draw-buffers-blend.c
@@ -33,7 +33,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/fbo/fbo-flushing-2.c b/tests/fbo/fbo-flushing-2.c
index 42586c0..412bf1a 100644
--- a/tests/fbo/fbo-flushing-2.c
+++ b/tests/fbo/fbo-flushing-2.c
@@ -36,7 +36,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#define TEX_WIDTH 8
#define TEX_HEIGHT 8
diff --git a/tests/fbo/fbo-flushing.c b/tests/fbo/fbo-flushing.c
index 849e0a0..936c7c3 100644
--- a/tests/fbo/fbo-flushing.c
+++ b/tests/fbo/fbo-flushing.c
@@ -36,7 +36,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#define TEX_WIDTH 128
#define TEX_HEIGHT 128
diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c
index 275a6d3..f91fe90 100644
--- a/tests/fbo/fbo-fragcoord2.c
+++ b/tests/fbo/fbo-fragcoord2.c
@@ -31,7 +31,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
256 /*window_width*/,
diff --git a/tests/fbo/fbo-scissor-bitmap.c b/tests/fbo/fbo-scissor-bitmap.c
index 2512dba..6b3ab74 100644
--- a/tests/fbo/fbo-scissor-bitmap.c
+++ b/tests/fbo/fbo-scissor-bitmap.c
@@ -33,7 +33,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
400 /*window_width*/,
diff --git a/tests/fbo/fbo-storage-completeness.c b/tests/fbo/fbo-storage-completeness.c
index 3f74ac1..b5a87ab 100644
--- a/tests/fbo/fbo-storage-completeness.c
+++ b/tests/fbo/fbo-storage-completeness.c
@@ -32,7 +32,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/fbo/fbo-storage-formats.c b/tests/fbo/fbo-storage-formats.c
index 93f2f4d..15132f7 100644
--- a/tests/fbo/fbo-storage-formats.c
+++ b/tests/fbo/fbo-storage-formats.c
@@ -31,7 +31,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/fbo/fbo-viewport.c b/tests/fbo/fbo-viewport.c
index 6f07046..e1033d5 100644
--- a/tests/fbo/fbo-viewport.c
+++ b/tests/fbo/fbo-viewport.c
@@ -30,7 +30,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
500 /*window_width*/,
diff --git a/tests/general/array-stride.c b/tests/general/array-stride.c
index 2d4ff83..8c360ce 100644
--- a/tests/general/array-stride.c
+++ b/tests/general/array-stride.c
@@ -28,7 +28,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/general/copy-pixels.c b/tests/general/copy-pixels.c
index 9cce238..4c38f27 100644
--- a/tests/general/copy-pixels.c
+++ b/tests/general/copy-pixels.c
@@ -30,7 +30,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 3152b6d..ca44d16 100644
--- a/tests/general/copypixels-draw-sync.c
+++ b/tests/general/copypixels-draw-sync.c
@@ -30,7 +30,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
64 /*window_width*/,
diff --git a/tests/general/copypixels-sync.c b/tests/general/copypixels-sync.c
index 8861eda..44379c7 100644
--- a/tests/general/copypixels-sync.c
+++ b/tests/general/copypixels-sync.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
64 /*window_width*/,
diff --git a/tests/general/depthfunc.c b/tests/general/depthfunc.c
index 0c3c355..92d3c90 100644
--- a/tests/general/depthfunc.c
+++ b/tests/general/depthfunc.c
@@ -31,7 +31,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/general/dlist-fdo3129-01.c b/tests/general/dlist-fdo3129-01.c
index 7a2c24b..56446ab 100644
--- a/tests/general/dlist-fdo3129-01.c
+++ b/tests/general/dlist-fdo3129-01.c
@@ -29,7 +29,6 @@
* Once upon a time, this triggered an assertion failure in Mesa.
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
256 /*window_width*/,
diff --git a/tests/general/dlist-fdo3129-02.c b/tests/general/dlist-fdo3129-02.c
index 3ad10ce..6d4eb99 100644
--- a/tests/general/dlist-fdo3129-02.c
+++ b/tests/general/dlist-fdo3129-02.c
@@ -29,7 +29,6 @@
* Once upon a time, this triggered an assertion failure in Mesa.
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
256 /*window_width*/,
diff --git a/tests/general/dlist-fdo31590.c b/tests/general/dlist-fdo31590.c
index 5556564..ffdeb47 100644
--- a/tests/general/dlist-fdo31590.c
+++ b/tests/general/dlist-fdo31590.c
@@ -34,7 +34,6 @@
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
static const char *TestName = "dlist-fdo31590";
diff --git a/tests/general/draw-copypixels-sync.c b/tests/general/draw-copypixels-sync.c
index a526687..0cb0f61 100644
--- a/tests/general/draw-copypixels-sync.c
+++ b/tests/general/draw-copypixels-sync.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
64 /*window_width*/,
diff --git a/tests/general/draw-sync.c b/tests/general/draw-sync.c
index c9cc433..628e18e 100644
--- a/tests/general/draw-sync.c
+++ b/tests/general/draw-sync.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
64 /*window_width*/,
diff --git a/tests/general/fog-modes.c b/tests/general/fog-modes.c
index 2982a1b..c4ad5d7 100644
--- a/tests/general/fog-modes.c
+++ b/tests/general/fog-modes.c
@@ -27,7 +27,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#if defined(_WIN32)
#undef near
diff --git a/tests/general/gl30basic.c b/tests/general/gl30basic.c
index 3a7f94d..b8fe829 100644
--- a/tests/general/gl30basic.c
+++ b/tests/general/gl30basic.c
@@ -32,7 +32,6 @@
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/general/hiz.c b/tests/general/hiz.c
index 892aa6e..ee9f945 100644
--- a/tests/general/hiz.c
+++ b/tests/general/hiz.c
@@ -31,7 +31,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
400 /*window_width*/,
diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c
index d8d0bce..b8d2a6c 100644
--- a/tests/general/isbufferobj.c
+++ b/tests/general/isbufferobj.c
@@ -33,7 +33,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/general/longprim.c b/tests/general/longprim.c
index 752335d..2c3b403 100644
--- a/tests/general/longprim.c
+++ b/tests/general/longprim.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
index cd93755..fecb173 100644
--- a/tests/general/roundmode-getintegerv.c
+++ b/tests/general/roundmode-getintegerv.c
@@ -40,7 +40,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#include <fenv.h>
diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
index 59c29b7..ace5cff 100644
--- a/tests/general/roundmode-pixelstore.c
+++ b/tests/general/roundmode-pixelstore.c
@@ -37,7 +37,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#include <fenv.h>
diff --git a/tests/general/scissor-bitmap.c b/tests/general/scissor-bitmap.c
index 612ffa6..0631bed 100644
--- a/tests/general/scissor-bitmap.c
+++ b/tests/general/scissor-bitmap.c
@@ -32,7 +32,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
400 /*window_width*/,
diff --git a/tests/general/select.c b/tests/general/select.c
index f28d700..70df613 100644
--- a/tests/general/select.c
+++ b/tests/general/select.c
@@ -32,7 +32,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/general/user-clip.c b/tests/general/user-clip.c
index 0828690..c5984bd 100644
--- a/tests/general/user-clip.c
+++ b/tests/general/user-clip.c
@@ -28,7 +28,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#define BOX_SIZE 32
diff --git a/tests/gles2/gles2_shader_runner.c b/tests/gles2/gles2_shader_runner.c
index 0b5d48d..e1d8297 100644
--- a/tests/gles2/gles2_shader_runner.c
+++ b/tests/gles2/gles2_shader_runner.c
@@ -33,7 +33,6 @@
#include <ctype.h>
#include <string.h>
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
250 /*window_width*/,
diff --git a/tests/shaders/fp-abs-01.c b/tests/shaders/fp-abs-01.c
index 592643c..269136b 100644
--- a/tests/shaders/fp-abs-01.c
+++ b/tests/shaders/fp-abs-01.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 a2d4319..ba43d1a 100644
--- a/tests/shaders/fp-abs-02.c
+++ b/tests/shaders/fp-abs-02.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 f51d848..32bd69a 100644
--- a/tests/shaders/fp-condition_codes-01.c
+++ b/tests/shaders/fp-condition_codes-01.c
@@ -30,7 +30,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
/* One for the reference square and one for each possible condition code.
*/
diff --git a/tests/shaders/fp-formats.c b/tests/shaders/fp-formats.c
index 049c428..32a47f1 100644
--- a/tests/shaders/fp-formats.c
+++ b/tests/shaders/fp-formats.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/shaders/fp-indirections2.c b/tests/shaders/fp-indirections2.c
index 1b22cd0..929809d 100644
--- a/tests/shaders/fp-indirections2.c
+++ b/tests/shaders/fp-indirections2.c
@@ -33,7 +33,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#define TEXTURE_SIZE 32 /* Note: Hardcoded dependencies in texture_init and texture_follow */
diff --git a/tests/shaders/fp-long-alu.c b/tests/shaders/fp-long-alu.c
index b185d46..784e2b9 100644
--- a/tests/shaders/fp-long-alu.c
+++ b/tests/shaders/fp-long-alu.c
@@ -35,7 +35,6 @@
#include <string.h>
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
32 /*window_width*/,
diff --git a/tests/shaders/fp-rfl.c b/tests/shaders/fp-rfl.c
index c7263ed..0b0cae8 100644
--- a/tests/shaders/fp-rfl.c
+++ b/tests/shaders/fp-rfl.c
@@ -31,7 +31,6 @@
#include <time.h>
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#define BOX_SIZE 8
diff --git a/tests/shaders/fp-set-01.c b/tests/shaders/fp-set-01.c
index ba30c99..288a213 100644
--- a/tests/shaders/fp-set-01.c
+++ b/tests/shaders/fp-set-01.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
/* One column for each possible combination of set-on results
*/
diff --git a/tests/shaders/fp-set-02.c b/tests/shaders/fp-set-02.c
index 2285b8d..57d13a4 100644
--- a/tests/shaders/fp-set-02.c
+++ b/tests/shaders/fp-set-02.c
@@ -33,7 +33,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
typedef int (cmp_func)(float a, float b);
diff --git a/tests/shaders/fp-unpack-01.c b/tests/shaders/fp-unpack-01.c
index 44bcef1..e0e1575 100644
--- a/tests/shaders/fp-unpack-01.c
+++ b/tests/shaders/fp-unpack-01.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 ae6e58f..1934f51 100644
--- a/tests/shaders/getuniform-01.c
+++ b/tests/shaders/getuniform-01.c
@@ -30,7 +30,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
20 /*window_width*/,
diff --git a/tests/shaders/getuniform-02.c b/tests/shaders/getuniform-02.c
index f568609..7b06fb5 100644
--- a/tests/shaders/getuniform-02.c
+++ b/tests/shaders/getuniform-02.c
@@ -27,7 +27,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
20 /*window_width*/,
diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c
index 1daf057..07163da 100644
--- a/tests/shaders/glsl-bindattriblocation.c
+++ b/tests/shaders/glsl-bindattriblocation.c
@@ -40,7 +40,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/shaders/glsl-dlist-getattriblocation.c b/tests/shaders/glsl-dlist-getattriblocation.c
index 1e15ac8..4be44a0 100644
--- a/tests/shaders/glsl-dlist-getattriblocation.c
+++ b/tests/shaders/glsl-dlist-getattriblocation.c
@@ -31,7 +31,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c
index 5ccf31a..1357e13 100644
--- a/tests/shaders/glsl-getattriblocation.c
+++ b/tests/shaders/glsl-getattriblocation.c
@@ -41,7 +41,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/shaders/glsl-max-vertex-attrib.c b/tests/shaders/glsl-max-vertex-attrib.c
index 8fbdd76..f7082da 100644
--- a/tests/shaders/glsl-max-vertex-attrib.c
+++ b/tests/shaders/glsl-max-vertex-attrib.c
@@ -35,7 +35,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
250 /*window_width*/,
diff --git a/tests/shaders/glsl-novertexdata.c b/tests/shaders/glsl-novertexdata.c
index 4165a9e..e13bb03 100644
--- a/tests/shaders/glsl-novertexdata.c
+++ b/tests/shaders/glsl-novertexdata.c
@@ -41,7 +41,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/shaders/glsl-reload-source.c b/tests/shaders/glsl-reload-source.c
index 785e12e..38a3a22 100644
--- a/tests/shaders/glsl-reload-source.c
+++ b/tests/shaders/glsl-reload-source.c
@@ -33,7 +33,6 @@
#include <stdio.h>
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/shaders/glsl-uniform-out-of-bounds.c b/tests/shaders/glsl-uniform-out-of-bounds.c
index cddf9cd..2af5fe3 100644
--- a/tests/shaders/glsl-uniform-out-of-bounds.c
+++ b/tests/shaders/glsl-uniform-out-of-bounds.c
@@ -35,7 +35,6 @@
#include <stdio.h>
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c
index 11f6081..303c775 100644
--- a/tests/shaders/glsl-uniform-update.c
+++ b/tests/shaders/glsl-uniform-update.c
@@ -35,7 +35,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/shaders/vp-address-01.c b/tests/shaders/vp-address-01.c
index d1ea451..117dabf 100644
--- a/tests/shaders/vp-address-01.c
+++ b/tests/shaders/vp-address-01.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
static const GLfloat attrib[] = {
1.0,
diff --git a/tests/shaders/vp-address-02.c b/tests/shaders/vp-address-02.c
index 8a9441a..81a78a7 100644
--- a/tests/shaders/vp-address-02.c
+++ b/tests/shaders/vp-address-02.c
@@ -34,7 +34,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 61597c0..72fb652 100644
--- a/tests/shaders/vp-address-03.c
+++ b/tests/shaders/vp-address-03.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 ff0edca..9bd4321 100644
--- a/tests/shaders/vp-address-04.c
+++ b/tests/shaders/vp-address-04.c
@@ -34,7 +34,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 f502f0d..596ec83 100644
--- a/tests/shaders/vp-address-05.c
+++ b/tests/shaders/vp-address-05.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 093ffcb..605f4b6 100644
--- a/tests/shaders/vp-address-06.c
+++ b/tests/shaders/vp-address-06.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#define TEST_ROWS 1
#define TEST_COLS 2
diff --git a/tests/shaders/vp-clipdistance-01.c b/tests/shaders/vp-clipdistance-01.c
index 028f05e..add7230 100644
--- a/tests/shaders/vp-clipdistance-01.c
+++ b/tests/shaders/vp-clipdistance-01.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 429c386..6538685 100644
--- a/tests/shaders/vp-clipdistance-02.c
+++ b/tests/shaders/vp-clipdistance-02.c
@@ -33,7 +33,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 a8c9e20..880cd14 100644
--- a/tests/shaders/vp-clipdistance-03.c
+++ b/tests/shaders/vp-clipdistance-03.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 467a92f..04409cf 100644
--- a/tests/shaders/vp-clipdistance-04.c
+++ b/tests/shaders/vp-clipdistance-04.c
@@ -33,7 +33,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#define TEST_ROWS 1
#define TEST_COLS 6
diff --git a/tests/shaders/vp-max-array.c b/tests/shaders/vp-max-array.c
index eebd0f5..568a8c9 100644
--- a/tests/shaders/vp-max-array.c
+++ b/tests/shaders/vp-max-array.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c
index e789bb1..7336e2c 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
@@ -36,7 +36,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
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 ddea5a9..b859196 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
@@ -36,7 +36,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/spec/arb_sampler_objects/framebufferblit.c b/tests/spec/arb_sampler_objects/framebufferblit.c
index 60386c3..82bb40f 100644
--- a/tests/spec/arb_sampler_objects/framebufferblit.c
+++ b/tests/spec/arb_sampler_objects/framebufferblit.c
@@ -35,7 +35,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
16 /*window_width*/,
diff --git a/tests/spec/arb_sampler_objects/sampler-incomplete.c b/tests/spec/arb_sampler_objects/sampler-incomplete.c
index 00f6a51..147bdc4 100644
--- a/tests/spec/arb_sampler_objects/sampler-incomplete.c
+++ b/tests/spec/arb_sampler_objects/sampler-incomplete.c
@@ -34,7 +34,6 @@
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/spec/arb_sampler_objects/sampler-objects.c b/tests/spec/arb_sampler_objects/sampler-objects.c
index 9615c39..c62618a 100644
--- a/tests/spec/arb_sampler_objects/sampler-objects.c
+++ b/tests/spec/arb_sampler_objects/sampler-objects.c
@@ -31,7 +31,6 @@
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
100 /*window_width*/,
diff --git a/tests/spec/arb_sampler_objects/srgb-decode.c b/tests/spec/arb_sampler_objects/srgb-decode.c
index 0cc7dbe..55cf520 100644
--- a/tests/spec/arb_sampler_objects/srgb-decode.c
+++ b/tests/spec/arb_sampler_objects/srgb-decode.c
@@ -40,7 +40,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
16 /*window_width*/,
diff --git a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c
index 2c6eadc..da9af27 100644
--- a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c
+++ b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c
@@ -32,7 +32,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
10 /*window_width*/,
diff --git a/tests/spec/ati_envmap_bumpmap/bump.c b/tests/spec/ati_envmap_bumpmap/bump.c
index cfea051..5aef76a 100644
--- a/tests/spec/ati_envmap_bumpmap/bump.c
+++ b/tests/spec/ati_envmap_bumpmap/bump.c
@@ -26,7 +26,6 @@
* Test of ATI_envmap_bumpmap texture combiners.
*/
-#include "piglit-framework.h"
#include "piglit-util-gl-common.h"
#define TEXSIZE 32
diff --git a/tests/spec/ext_fog_coord/modes.c b/tests/spec/ext_fog_coord/modes.c
index a6f3e9a..72cc22e 100644
--- a/tests/spec/ext_fog_coord/modes.c
+++ b/tests/spec/ext_fog_coord/modes.c
@@ -27,7 +27,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#if defined(_WIN32)
#undef near
diff --git a/tests/texturing/depth-tex-compare.c b/tests/texturing/depth-tex-compare.c
index ea719b1..6bb71db 100644
--- a/tests/texturing/depth-tex-compare.c
+++ b/tests/texturing/depth-tex-compare.c
@@ -32,7 +32,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#define BOX_SIZE 25
diff --git a/tests/texturing/depth-tex-modes-rg.c b/tests/texturing/depth-tex-modes-rg.c
index b1efb44..4780f2f 100644
--- a/tests/texturing/depth-tex-modes-rg.c
+++ b/tests/texturing/depth-tex-modes-rg.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.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 13cba4d..951a4f4 100644
--- a/tests/texturing/depth-tex-modes.c
+++ b/tests/texturing/depth-tex-modes.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
#include "depth-tex-modes-common.h"
static const GLenum depth_texture_modes[] = {
diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c
index 2a885e0..037a3d5 100644
--- a/tests/texturing/lodbias.c
+++ b/tests/texturing/lodbias.c
@@ -40,7 +40,6 @@
* Check clamping behaviour.
*/
-#include "piglit-framework.h"
#include "piglit-util-gl-common.h"
#define SquareSize 32
diff --git a/tests/texturing/mipmap-setup.c b/tests/texturing/mipmap-setup.c
index 3ce87b5..dee7902 100644
--- a/tests/texturing/mipmap-setup.c
+++ b/tests/texturing/mipmap-setup.c
@@ -32,7 +32,6 @@
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
200 /*window_width*/,
diff --git a/tests/texturing/rg-draw-pixels.c b/tests/texturing/rg-draw-pixels.c
index cc696d5..4231cd0 100644
--- a/tests/texturing/rg-draw-pixels.c
+++ b/tests/texturing/rg-draw-pixels.c
@@ -29,7 +29,6 @@
*/
#include "piglit-util-gl-common.h"
-#include "piglit-framework.h"
PIGLIT_GL_TEST_MAIN(
40 /*window_width*/,
diff --git a/tests/texturing/rg-teximage-01.c b/tests/texturing/rg-teximage-01.c
index 35e4f85..173f58a 100644
--- a/tests/texturing/rg-teximage-01.c
+++ b/tests/texturing/rg-teximage-01.c
@@ -32,7 +32,6 @@
* \author Ian Romanick <ian.d.romanick at intel.com>
*/
-#include "piglit-framework.h"
#include "piglit-util-gl-common.h"
#include "rg-teximage-common.h"
diff --git a/tests/texturing/rg-teximage-02.c b/tests/texturing/rg-teximage-02.c
index 77c568e..62d23cf 100644
--- a/tests/texturing/rg-teximage-02.c
+++ b/tests/texturing/rg-teximage-02.c
@@ -32,7 +32,6 @@
* \author Ian Romanick <ian.d.romanick at intel.com>
*/
-#include "piglit-framework.h"
#include "piglit-util-gl-common.h"
#include "rg-teximage-common.h"
diff --git a/tests/texturing/rg-teximage-common.c b/tests/texturing/rg-teximage-common.c
index 2d09749..1c1a383 100644
--- a/tests/texturing/rg-teximage-common.c
+++ b/tests/texturing/rg-teximage-common.c
@@ -32,7 +32,6 @@
* \author Ian Romanick <ian.d.romanick at intel.com>
*/
-#include "piglit-framework.h"
#include "piglit-util-gl-common.h"
#include "rg-teximage-common.h"
diff --git a/tests/texturing/rgtc-teximage-01.c b/tests/texturing/rgtc-teximage-01.c
index 2319a91..4770a9f 100644
--- a/tests/texturing/rgtc-teximage-01.c
+++ b/tests/texturing/rgtc-teximage-01.c
@@ -33,7 +33,6 @@
* Modified by Dave Airlie for RGTC
*/
-#include "piglit-framework.h"
#include "piglit-util-gl-common.h"
#include "rg-teximage-common.h"
diff --git a/tests/texturing/rgtc-teximage-02.c b/tests/texturing/rgtc-teximage-02.c
index 91834f3..2337ad1 100644
--- a/tests/texturing/rgtc-teximage-02.c
+++ b/tests/texturing/rgtc-teximage-02.c
@@ -33,7 +33,6 @@
* modified by Dave Airlie for RGTC
*/
-#include "piglit-framework.h"
#include "piglit-util-gl-common.h"
#include "rg-teximage-common.h"
diff --git a/tests/texturing/tex-skipped-unit.c b/tests/texturing/tex-skipped-unit.c
index 19c9ad9..14ddcee 100644
--- a/tests/texturing/tex-skipped-unit.c
+++ b/tests/texturing/tex-skipped-unit.c
@@ -26,7 +26,6 @@
* Test of ATI_envmap_bumpmap texture combiners.
*/
-#include "piglit-framework.h"
#include "piglit-util-gl-common.h"
#define TEXSIZE 32
--
1.7.12.1
More information about the Piglit
mailing list