diff options
| author | Blaž Tomažič <blaz.tomazic@gmail.com> | 2012-06-28 02:32:25 +0200 |
|---|---|---|
| committer | Blaž Tomažič <blaz.tomazic@gmail.com> | 2012-06-28 03:02:19 +0200 |
| commit | 2d3c6e51c25a6915d1fc74a13d2b57591bcf4ea8 (patch) | |
| tree | 8654e8f1cb00c2a58822c30a8b25caa22e836391 /tests/spec | |
| parent | 3c830b8713fe2afc7134aad8152427e8c50a41ab (diff) | |
util: Move piglit-util to piglit-util-gl-common
Move piglit-util.* to piglit-util-gl-common.*
Signed-off-by: Blaž Tomažič <blaz.tomazic@gmail.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'tests/spec')
216 files changed, 216 insertions, 216 deletions
diff --git a/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c b/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c index b2ddce5db..7ec34a4b8 100644 --- a/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c +++ b/tests/spec/amd_seamless_cubemap_per_texture/amd_seamless_cubemap_per_texture.c @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 250 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c index 79f39538b..33987b145 100644 --- a/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c +++ b/tests/spec/arb_blend_func_extended/api/bindfragdataindexed-invalid-parameters.c @@ -27,7 +27,7 @@ * * \author Ian Romanick + Dave Airlie (extended tests) */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/api/blend-api.c b/tests/spec/arb_blend_func_extended/api/blend-api.c index 37d17f8c6..c7933b83e 100644 --- a/tests/spec/arb_blend_func_extended/api/blend-api.c +++ b/tests/spec/arb_blend_func_extended/api/blend-api.c @@ -26,7 +26,7 @@ * \author Dave Airlie * Test additions to blending API from ARB_blend_func_extended */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/api/error-at-begin.c b/tests/spec/arb_blend_func_extended/api/error-at-begin.c index c3748f8dc..6bdbb8ec2 100644 --- a/tests/spec/arb_blend_func_extended/api/error-at-begin.c +++ b/tests/spec/arb_blend_func_extended/api/error-at-begin.c @@ -32,7 +32,7 @@ * ONE_MINUS_SRC1_ALPHA), and a framebuffer is bound that has more than * the value of MAX_DUAL_SOURCE_DRAW_BUFFERS-1 active color attachements." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c index edd4ad7f6..733404c63 100644 --- a/tests/spec/arb_blend_func_extended/api/getfragdataindex.c +++ b/tests/spec/arb_blend_func_extended/api/getfragdataindex.c @@ -26,7 +26,7 @@ * \author Dave Airlie * heavily inspired by getfragdatalocation.c from Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c index 1f8027295..bbb3d83a0 100644 --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend-explicit.c @@ -35,7 +35,7 @@ * so just have the initial test validate that */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c index 041c13b47..558b3c301 100644 --- a/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c +++ b/tests/spec/arb_blend_func_extended/execution/fbo-extended-blend.c @@ -35,7 +35,7 @@ * so just have the initial test validate that */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_color_buffer_float/common.h b/tests/spec/arb_color_buffer_float/common.h index e0998e7c4..f71077c04 100644 --- a/tests/spec/arb_color_buffer_float/common.h +++ b/tests/spec/arb_color_buffer_float/common.h @@ -30,7 +30,7 @@ * different ways! */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN(128 /*window_width*/, 128 /*window_height*/, diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c index 6115dac6c..f3dd62d44 100644 --- a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c +++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define COPY_BUFFER_SIZE (4<<20) uint8_t src_data[COPY_BUFFER_SIZE]; diff --git a/tests/spec/arb_copy_buffer/copybuffersubdata.c b/tests/spec/arb_copy_buffer/copybuffersubdata.c index 7d41222b5..5f61a39eb 100644 --- a/tests/spec/arb_copy_buffer/copybuffersubdata.c +++ b/tests/spec/arb_copy_buffer/copybuffersubdata.c @@ -28,7 +28,7 @@ * Jan 2012 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/dlist.c b/tests/spec/arb_copy_buffer/dlist.c index 34bf3dd09..288f22972 100644 --- a/tests/spec/arb_copy_buffer/dlist.c +++ b/tests/spec/arb_copy_buffer/dlist.c @@ -31,7 +31,7 @@ * CopyBufferSubData" */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/get.c b/tests/spec/arb_copy_buffer/get.c index 8ec966aa9..099846ea2 100644 --- a/tests/spec/arb_copy_buffer/get.c +++ b/tests/spec/arb_copy_buffer/get.c @@ -26,7 +26,7 @@ * Tests that the getters for the new binding points in GL_ARB_copy_buffer work. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/negative-bound-zero.c b/tests/spec/arb_copy_buffer/negative-bound-zero.c index 91fb75343..0746b90ef 100644 --- a/tests/spec/arb_copy_buffer/negative-bound-zero.c +++ b/tests/spec/arb_copy_buffer/negative-bound-zero.c @@ -29,7 +29,7 @@ * readtarget or writetarget." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/negative-bounds.c b/tests/spec/arb_copy_buffer/negative-bounds.c index 605702f8f..c4208e770 100644 --- a/tests/spec/arb_copy_buffer/negative-bounds.c +++ b/tests/spec/arb_copy_buffer/negative-bounds.c @@ -35,7 +35,7 @@ * error checking doesn't fail copies within the bounds. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/negative-mapped.c b/tests/spec/arb_copy_buffer/negative-mapped.c index 1cc296a1e..fe65338d9 100644 --- a/tests/spec/arb_copy_buffer/negative-mapped.c +++ b/tests/spec/arb_copy_buffer/negative-mapped.c @@ -29,7 +29,7 @@ * bound to either readtarget or writetarget are mapped." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/overlap.c b/tests/spec/arb_copy_buffer/overlap.c index 62b62f8e3..b61688b5d 100644 --- a/tests/spec/arb_copy_buffer/overlap.c +++ b/tests/spec/arb_copy_buffer/overlap.c @@ -34,7 +34,7 @@ * overlap, but with one buffer being both src and dst. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_copy_buffer/targets.c b/tests/spec/arb_copy_buffer/targets.c index 7378ea642..3a6025fdd 100644 --- a/tests/spec/arb_copy_buffer/targets.c +++ b/tests/spec/arb_copy_buffer/targets.c @@ -45,7 +45,7 @@ * that copies work for them. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_debug_output/api_error.c b/tests/spec/arb_debug_output/api_error.c index d2517502e..3ea9634fa 100644 --- a/tests/spec/arb_debug_output/api_error.c +++ b/tests/spec/arb_debug_output/api_error.c @@ -22,7 +22,7 @@ * SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_draw_buffers/state_change.c b/tests/spec/arb_draw_buffers/state_change.c index c4960b1cc..17a8a13a5 100644 --- a/tests/spec/arb_draw_buffers/state_change.c +++ b/tests/spec/arb_draw_buffers/state_change.c @@ -29,7 +29,7 @@ * It would then fail to enable the second buffer again because it was already * pointing to the new buffer. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c b/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c index 88158ef0e..11c0df56f 100644 --- a/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c +++ b/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist-arb_draw_instanced.c diff --git a/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c b/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c index 41c3f5c74..870abcc2a 100644 --- a/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c +++ b/tests/spec/arb_draw_elements_base_vertex/draw-elements-instanced-base-vertex.c @@ -33,7 +33,7 @@ * color modifier and an y offset. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 300 /*window_width*/, diff --git a/tests/spec/arb_draw_instanced/execution/dlist.c b/tests/spec/arb_draw_instanced/execution/dlist.c index bdc9940ad..331f93f70 100644 --- a/tests/spec/arb_draw_instanced/execution/dlist.c +++ b/tests/spec/arb_draw_instanced/execution/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist.c diff --git a/tests/spec/arb_draw_instanced/execution/elements.c b/tests/spec/arb_draw_instanced/execution/elements.c index 3a400b2e6..daa71d9fe 100644 --- a/tests/spec/arb_draw_instanced/execution/elements.c +++ b/tests/spec/arb_draw_instanced/execution/elements.c @@ -31,7 +31,7 @@ * glDrawArraysInstancedARB(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, diff --git a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c index 96abaf620..de8e8a2ce 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c +++ b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-arrays-first-negative.c diff --git a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c index 42707c0b3..878bbd4c2 100644 --- a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c +++ b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-elements-type.c diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c index 9b2c34b38..ec1e524a7 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-depthrangef.c @@ -27,7 +27,7 @@ * glDepthRange) and that it works. Based on general/depth-clamp-range.c. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 150 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c index b61a33b94..b796ba9c4 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-drawbuffers.c @@ -28,7 +28,7 @@ * INCOMPLETE_READ_BUFFER with ARB_ES2_compatibility. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c index db6832196..7130aaa5b 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c @@ -22,7 +22,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include <stdarg.h> PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c index cea73631c..5767867f2 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c @@ -33,7 +33,7 @@ * if \c GL_OES_fragment_precision_high is supported. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c index da04067bf..7c3204685 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c @@ -26,7 +26,7 @@ * Tests that MAX_*_VECTORS = MAX_*_COMPONENTS / 4. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c index 6996117d2..2ed7dd7d1 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c @@ -31,7 +31,7 @@ * glReleaseShaderCompiler(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c index 09eecd5f7..b9fb9898e 100644 --- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c +++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c @@ -27,7 +27,7 @@ * SHADER_COMPILER being present. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c index 1ed379c90..6247e9d8f 100644 --- a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c +++ b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-blit.c @@ -54,7 +54,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c index 70c9d6c71..e9df4be05 100644 --- a/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c +++ b/tests/spec/arb_es2_compatibility/fbo-missing-attachment-clear.c @@ -41,7 +41,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_fragment_program/minmax.c b/tests/spec/arb_fragment_program/minmax.c index b059408ed..dbb9b3e77 100644 --- a/tests/spec/arb_fragment_program/minmax.c +++ b/tests/spec/arb_fragment_program/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum values in GL_ARB_fragment_program. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c index be87270dd..3b9bf1bed 100644 --- a/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c +++ b/tests/spec/arb_framebuffer_object/get-renderbuffer-internalformat.c @@ -29,7 +29,7 @@ */ #include <stdio.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "../../fbo/fbo-formats.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c index 681d941e1..e9de8a422 100644 --- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c +++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c @@ -29,7 +29,7 @@ */ #include <stdio.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c index 20fe7d4cb..5c69898db 100644 --- a/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c +++ b/tests/spec/arb_framebuffer_object/same-attachment-glFramebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c @@ -30,7 +30,7 @@ */ #include <stdio.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/spec/arb_instanced_arrays/instanced_arrays.c b/tests/spec/arb_instanced_arrays/instanced_arrays.c index ab6ff7143..3d1a1b15e 100644 --- a/tests/spec/arb_instanced_arrays/instanced_arrays.c +++ b/tests/spec/arb_instanced_arrays/instanced_arrays.c @@ -27,7 +27,7 @@ * Tests GL_ARB_instanced_arrays */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 500 /*window_width*/, diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c index aebed744d..1e6f69b2c 100644 --- a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c +++ b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c @@ -26,7 +26,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c index 643cda3ca..b8a89b0e2 100644 --- a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c +++ b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c @@ -25,7 +25,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_multisample/beginend.c b/tests/spec/arb_multisample/beginend.c index abe40a459..bdcc02e8c 100644 --- a/tests/spec/arb_multisample/beginend.c +++ b/tests/spec/arb_multisample/beginend.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file beginend.c diff --git a/tests/spec/arb_multisample/pushpop.c b/tests/spec/arb_multisample/pushpop.c index ba1b8c34a..35aa605a8 100644 --- a/tests/spec/arb_multisample/pushpop.c +++ b/tests/spec/arb_multisample/pushpop.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file pushpop.c diff --git a/tests/spec/arb_robustness/client-mem-bounds.c b/tests/spec/arb_robustness/client-mem-bounds.c index d15808619..393772256 100644 --- a/tests/spec/arb_robustness/client-mem-bounds.c +++ b/tests/spec/arb_robustness/client-mem-bounds.c @@ -21,7 +21,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/spec/arb_robustness/draw-vbo-bounds.c b/tests/spec/arb_robustness/draw-vbo-bounds.c index 90f6b0372..8256f4e41 100644 --- a/tests/spec/arb_robustness/draw-vbo-bounds.c +++ b/tests/spec/arb_robustness/draw-vbo-bounds.c @@ -45,7 +45,7 @@ * - provide a command line option to actually enable ARB_robustness */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/spec/arb_sampler_objects/sampler-incomplete.c b/tests/spec/arb_sampler_objects/sampler-incomplete.c index 32dd737f9..75d195538 100644 --- a/tests/spec/arb_sampler_objects/sampler-incomplete.c +++ b/tests/spec/arb_sampler_objects/sampler-incomplete.c @@ -33,7 +33,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_sampler_objects/sampler-objects.c b/tests/spec/arb_sampler_objects/sampler-objects.c index 053c2bc55..86679db9f 100644 --- a/tests/spec/arb_sampler_objects/sampler-objects.c +++ b/tests/spec/arb_sampler_objects/sampler-objects.c @@ -30,7 +30,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c index 7ef228fb0..182ab2d6f 100644 --- a/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c +++ b/tests/spec/arb_seamless_cube_map/arb_seamless_cubemap.c @@ -19,7 +19,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c index bf7c5f701..d5a675fb1 100644 --- a/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c +++ b/tests/spec/arb_shader_objects/bindattriblocation-scratch-name.c @@ -31,7 +31,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_shader_objects/clear-with-deleted.c b/tests/spec/arb_shader_objects/clear-with-deleted.c index 756523750..833dcc8a2 100644 --- a/tests/spec/arb_shader_objects/clear-with-deleted.c +++ b/tests/spec/arb_shader_objects/clear-with-deleted.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file clear-with-deleted.c diff --git a/tests/spec/arb_shader_objects/delete-repeat.c b/tests/spec/arb_shader_objects/delete-repeat.c index b00c9dafd..f4497de2b 100644 --- a/tests/spec/arb_shader_objects/delete-repeat.c +++ b/tests/spec/arb_shader_objects/delete-repeat.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file delete-repeat.c diff --git a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c index ba9e5f961..317717028 100644 --- a/tests/spec/arb_shader_objects/getactiveuniform-beginend.c +++ b/tests/spec/arb_shader_objects/getactiveuniform-beginend.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file getactiveuniform-beginend.c diff --git a/tests/spec/arb_shader_objects/getuniform.c b/tests/spec/arb_shader_objects/getuniform.c index be33f211f..a69a2589e 100644 --- a/tests/spec/arb_shader_objects/getuniform.c +++ b/tests/spec/arb_shader_objects/getuniform.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file getuniform.c diff --git a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c index faf19503f..b4abe3cd7 100644 --- a/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c +++ b/tests/spec/arb_shader_objects/getuniformlocation-array-of-struct-of-array.c @@ -29,7 +29,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_shader_texture_lod/execution/texgrad.c b/tests/spec/arb_shader_texture_lod/execution/texgrad.c index 0c23ef25d..629b0b527 100644 --- a/tests/spec/arb_shader_texture_lod/execution/texgrad.c +++ b/tests/spec/arb_shader_texture_lod/execution/texgrad.c @@ -29,7 +29,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 512 /*window_width*/, diff --git a/tests/spec/arb_sync/repeat-wait.c b/tests/spec/arb_sync/repeat-wait.c index 3e29e95f9..a812824bf 100644 --- a/tests/spec/arb_sync/repeat-wait.c +++ b/tests/spec/arb_sync/repeat-wait.c @@ -41,7 +41,7 @@ * driver on a later ClientWaitSync. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_sync/timeout-zero.c b/tests/spec/arb_sync/timeout-zero.c index 751b298cd..4e162ba9f 100644 --- a/tests/spec/arb_sync/timeout-zero.c +++ b/tests/spec/arb_sync/timeout-zero.c @@ -36,7 +36,7 @@ * performed." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/dlist.c b/tests/spec/arb_texture_buffer_object/dlist.c index 24b15bce8..dd8e62df3 100644 --- a/tests/spec/arb_texture_buffer_object/dlist.c +++ b/tests/spec/arb_texture_buffer_object/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist.c diff --git a/tests/spec/arb_texture_buffer_object/formats.c b/tests/spec/arb_texture_buffer_object/formats.c index 19fbb9d40..8e2511b99 100644 --- a/tests/spec/arb_texture_buffer_object/formats.c +++ b/tests/spec/arb_texture_buffer_object/formats.c @@ -26,7 +26,7 @@ */ #define _GNU_SOURCE -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 200 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/get.c b/tests/spec/arb_texture_buffer_object/get.c index ad60975f1..ffbc4e131 100644 --- a/tests/spec/arb_texture_buffer_object/get.c +++ b/tests/spec/arb_texture_buffer_object/get.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file get.c diff --git a/tests/spec/arb_texture_buffer_object/minmax.c b/tests/spec/arb_texture_buffer_object/minmax.c index 677da726a..22399c42a 100644 --- a/tests/spec/arb_texture_buffer_object/minmax.c +++ b/tests/spec/arb_texture_buffer_object/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum value in the GL_ARB_texture_buffer_object spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c index a576c8800..c1a2f748c 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-bo.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-bo.c @@ -28,7 +28,7 @@ * buffer object, the error INVALID_OPERATION is generated." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-format.c b/tests/spec/arb_texture_buffer_object/negative-bad-format.c index e002fd3df..601712170 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-format.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-format.c @@ -28,7 +28,7 @@ * of the sized internal formats found in Table X.1." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/negative-bad-target.c b/tests/spec/arb_texture_buffer_object/negative-bad-target.c index 47e1fbfe6..3885cd712 100644 --- a/tests/spec/arb_texture_buffer_object/negative-bad-target.c +++ b/tests/spec/arb_texture_buffer_object/negative-bad-target.c @@ -27,7 +27,7 @@ * "<target> must be TEXTURE_BUFFER_ARB" */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_texture_buffer_object/unused-name.c b/tests/spec/arb_texture_buffer_object/unused-name.c index 117a4e73b..9f0b77a46 100644 --- a/tests/spec/arb_texture_buffer_object/unused-name.c +++ b/tests/spec/arb_texture_buffer_object/unused-name.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file unused-name.c diff --git a/tests/spec/arb_texture_compression/internal-format-query.c b/tests/spec/arb_texture_compression/internal-format-query.c index ff7ef0243..9f29f6ed1 100644 --- a/tests/spec/arb_texture_compression/internal-format-query.c +++ b/tests/spec/arb_texture_compression/internal-format-query.c @@ -68,7 +68,7 @@ * and the texture image will not be compressed by the GL." */ #include <stdarg.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_texture_compression/invalid-formats.c b/tests/spec/arb_texture_compression/invalid-formats.c index 561fa1f8a..7023aa8ba 100644 --- a/tests/spec/arb_texture_compression/invalid-formats.c +++ b/tests/spec/arb_texture_compression/invalid-formats.c @@ -37,7 +37,7 @@ * All texture compression extensions have taken this to mean only linear RGB * and linear RGBA formats should be exposed. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_texture_float/texture-float-formats.c b/tests/spec/arb_texture_float/texture-float-formats.c index 326326a32..978ef815c 100644 --- a/tests/spec/arb_texture_float/texture-float-formats.c +++ b/tests/spec/arb_texture_float/texture-float-formats.c @@ -26,7 +26,7 @@ * Tests GL_ARB_texture_float floating point formats */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_texture_storage/texture-storage.c b/tests/spec/arb_texture_storage/texture-storage.c index 0f1612377..959d13982 100644 --- a/tests/spec/arb_texture_storage/texture-storage.c +++ b/tests/spec/arb_texture_storage/texture-storage.c @@ -28,7 +28,7 @@ * Brian Paul */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_transform_feedback2/draw-auto.c b/tests/spec/arb_transform_feedback2/draw-auto.c index 18ab469a1..06f55ca62 100644 --- a/tests/spec/arb_transform_feedback2/draw-auto.c +++ b/tests/spec/arb_transform_feedback2/draw-auto.c @@ -27,7 +27,7 @@ * Test Pause, Resume, and DrawTF. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c index 3a4dcf29b..c64395ee8 100644 --- a/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c +++ b/tests/spec/arb_uniform_buffer_object/bindbuffer-general-point.c @@ -27,7 +27,7 @@ * binding point. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/buffer-targets.c b/tests/spec/arb_uniform_buffer_object/buffer-targets.c index a99349175..556223a27 100644 --- a/tests/spec/arb_uniform_buffer_object/buffer-targets.c +++ b/tests/spec/arb_uniform_buffer_object/buffer-targets.c @@ -35,7 +35,7 @@ * UNIFORM_BUFFER" */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/getintegeri_v.c b/tests/spec/arb_uniform_buffer_object/getintegeri_v.c index 1beca4cb9..852a14eb6 100644 --- a/tests/spec/arb_uniform_buffer_object/getintegeri_v.c +++ b/tests/spec/arb_uniform_buffer_object/getintegeri_v.c @@ -35,7 +35,7 @@ * is bound to <index>, -1 is returned." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c b/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c index 772ceb285..a7cb57bff 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformblockindex.c @@ -28,7 +28,7 @@ * for active blocks. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/getuniformindices.c b/tests/spec/arb_uniform_buffer_object/getuniformindices.c index e9e31edcd..9819c6dad 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformindices.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformindices.c @@ -27,7 +27,7 @@ * and consecutive indices starting from 0. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/getuniformlocation.c b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c index 574524419..8f0245d38 100644 --- a/tests/spec/arb_uniform_buffer_object/getuniformlocation.c +++ b/tests/spec/arb_uniform_buffer_object/getuniformlocation.c @@ -37,7 +37,7 @@ * <name> is associated with a named uniform block..." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/layout-std140.c b/tests/spec/arb_uniform_buffer_object/layout-std140.c index 5f7f26dd3..429b5740b 100644 --- a/tests/spec/arb_uniform_buffer_object/layout-std140.c +++ b/tests/spec/arb_uniform_buffer_object/layout-std140.c @@ -34,7 +34,7 @@ * http://www.opengl.org/registry/specs/ARB/uniform_buffer_object.txt */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/minmax.c b/tests/spec/arb_uniform_buffer_object/minmax.c index 0f4bd402d..590f2a7c1 100644 --- a/tests/spec/arb_uniform_buffer_object/minmax.c +++ b/tests/spec/arb_uniform_buffer_object/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.1 spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c index c85f5c35c..185c373e0 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-buffer.c @@ -26,7 +26,7 @@ * Tests for errors when binding a bad buffer object name. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c index 5d7f5b4fc..8f7c4a1e1 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-index.c @@ -27,7 +27,7 @@ * buffer binding point. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c index 5edcabc8f..e884040d1 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbuffer-target.c @@ -26,7 +26,7 @@ * Tests for errors when binding with a bad target. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c b/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c index 549abeaea..cb5ecdea4 100644 --- a/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c +++ b/tests/spec/arb_uniform_buffer_object/negative-bindbufferrange-range.c @@ -39,7 +39,7 @@ * <size> equal to the size of <buffer>." */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c index d5afd1b83..3e0c9396c 100644 --- a/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c +++ b/tests/spec/arb_vertex_buffer_object/elements-negative-offset.c @@ -28,7 +28,7 @@ * to access the new vertex data. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c b/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c index c1ba6f484..0b46cafaf 100644 --- a/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c +++ b/tests/spec/arb_vertex_buffer_object/mixed-immediate-and-vbo.c @@ -30,7 +30,7 @@ * https://bugs.freedesktop.org/show_bug.cgi?id=37934 */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_vertex_program/getenv4d-with-error.c b/tests/spec/arb_vertex_program/getenv4d-with-error.c index 6e07555bc..6bdfc7cb4 100644 --- a/tests/spec/arb_vertex_program/getenv4d-with-error.c +++ b/tests/spec/arb_vertex_program/getenv4d-with-error.c @@ -28,7 +28,7 @@ * context. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_vertex_program/getlocal4d-with-error.c b/tests/spec/arb_vertex_program/getlocal4d-with-error.c index f7a453c8a..243fd4f93 100644 --- a/tests/spec/arb_vertex_program/getlocal4d-with-error.c +++ b/tests/spec/arb_vertex_program/getlocal4d-with-error.c @@ -28,7 +28,7 @@ * context. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/arb_vertex_program/minmax.c b/tests/spec/arb_vertex_program/minmax.c index b58bc5482..461d17339 100644 --- a/tests/spec/arb_vertex_program/minmax.c +++ b/tests/spec/arb_vertex_program/minmax.c @@ -25,7 +25,7 @@ * Test for the minimum maximum values in GL_ARB_vertex_program. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c index f28ed84a6..82e4f0372 100644 --- a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c +++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c @@ -27,7 +27,7 @@ /* this test does some basic tests of ARB_vertex_type_2_10_10_10 vbos */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 320 /*window_width*/, diff --git a/tests/spec/ati_draw_buffers/arbfp-no-index.c b/tests/spec/ati_draw_buffers/arbfp-no-index.c index 204556707..d3f10f5de 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-index.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-index.c @@ -39,7 +39,7 @@ * This bug in Mesa impacted Trine. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/ati_draw_buffers/arbfp-no-option.c b/tests/spec/ati_draw_buffers/arbfp-no-option.c index 0a1491abf..3c3212fe9 100644 --- a/tests/spec/ati_draw_buffers/arbfp-no-option.c +++ b/tests/spec/ati_draw_buffers/arbfp-no-option.c @@ -38,7 +38,7 @@ * into which output color 0 is written.' */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/ati_draw_buffers/arbfp.c b/tests/spec/ati_draw_buffers/arbfp.c index d69e87342..496c43e9b 100644 --- a/tests/spec/ati_draw_buffers/arbfp.c +++ b/tests/spec/ati_draw_buffers/arbfp.c @@ -32,7 +32,7 @@ * ATI_draw_buffers and ARB_fragment_program works. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/ati_envmap_bumpmap/bump.c b/tests/spec/ati_envmap_bumpmap/bump.c index 7ae2e2c06..e6c95b850 100644 --- a/tests/spec/ati_envmap_bumpmap/bump.c +++ b/tests/spec/ati_envmap_bumpmap/bump.c @@ -27,7 +27,7 @@ */ #include "piglit-framework.h" -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define TEXSIZE 32 diff --git a/tests/spec/ext_fog_coord/modes.c b/tests/spec/ext_fog_coord/modes.c index df1e7a939..e0ef6f44b 100644 --- a/tests/spec/ext_fog_coord/modes.c +++ b/tests/spec/ext_fog_coord/modes.c @@ -26,7 +26,7 @@ * Tests that the three fog modes work with fog enabled using EXT_fog_coord. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-framework.h" #if defined(_WIN32) diff --git a/tests/spec/ext_framebuffer_multisample/common.h b/tests/spec/ext_framebuffer_multisample/common.h index dd0937020..d941e96c6 100644 --- a/tests/spec/ext_framebuffer_multisample/common.h +++ b/tests/spec/ext_framebuffer_multisample/common.h @@ -26,7 +26,7 @@ * test cases. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "math.h" enum test_type_enum { diff --git a/tests/spec/ext_framebuffer_multisample/dlist.c b/tests/spec/ext_framebuffer_multisample/dlist.c index b8964f1fa..9f4a05583 100644 --- a/tests/spec/ext_framebuffer_multisample/dlist.c +++ b/tests/spec/ext_framebuffer_multisample/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist.c diff --git a/tests/spec/ext_framebuffer_multisample/minmax.c b/tests/spec/ext_framebuffer_multisample/minmax.c index a5ea174a0..7cb515cae 100644 --- a/tests/spec/ext_framebuffer_multisample/minmax.c +++ b/tests/spec/ext_framebuffer_multisample/minmax.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file max_samples.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c index e05d7ddb3..6b0e984e2 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c +++ b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-copypixels.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c index 06b3dd6e5..06bcadb30 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c +++ b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-copyteximage.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c index e95335736..6ffe25fb4 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-max-samples.c +++ b/tests/spec/ext_framebuffer_multisample/negative-max-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-max-samples.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c b/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c index 3d5bf6e87..ab6fea778 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c +++ b/tests/spec/ext_framebuffer_multisample/negative-mismatched-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file samples.c diff --git a/tests/spec/ext_framebuffer_multisample/negative-readpixels.c b/tests/spec/ext_framebuffer_multisample/negative-readpixels.c index 44385d5ae..dfc792e3d 100644 --- a/tests/spec/ext_framebuffer_multisample/negative-readpixels.c +++ b/tests/spec/ext_framebuffer_multisample/negative-readpixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file negative-readpixels.c diff --git a/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c index cd69d165f..c04241d89 100644 --- a/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c +++ b/tests/spec/ext_framebuffer_multisample/renderbuffer-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file renderbuffer-samples.c diff --git a/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c index b8f459232..692e8b256 100644 --- a/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c +++ b/tests/spec/ext_framebuffer_multisample/renderbufferstorage-samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file renderbufferstorage-samples.c diff --git a/tests/spec/ext_framebuffer_multisample/samples.c b/tests/spec/ext_framebuffer_multisample/samples.c index 2c5e17862..3e5eab730 100644 --- a/tests/spec/ext_framebuffer_multisample/samples.c +++ b/tests/spec/ext_framebuffer_multisample/samples.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file samples.c diff --git a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c index 30aeb3af0..748c86b08 100644 --- a/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c +++ b/tests/spec/ext_packed_depth_stencil/readpixels-24_8.c @@ -28,7 +28,7 @@ * combinations. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define BUF_WIDTH 15 #define BUF_HEIGHT 15 diff --git a/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c index ba5aad570..8e0469b01 100644 --- a/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c +++ b/tests/spec/ext_packed_float/getteximage-invalid-format-for-packed-type.c @@ -67,7 +67,7 @@ * */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_packed_float/pack.c b/tests/spec/ext_packed_float/pack.c index 47c264054..9e9eff87a 100755 --- a/tests/spec/ext_packed_float/pack.c +++ b/tests/spec/ext_packed_float/pack.c @@ -27,7 +27,7 @@ * GL_UNSIGNED_INT_10F_11F_11F_REV format. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/ext_texture_array/maxlayers.c b/tests/spec/ext_texture_array/maxlayers.c index 5fdbca04b..07caed687 100644 --- a/tests/spec/ext_texture_array/maxlayers.c +++ b/tests/spec/ext_texture_array/maxlayers.c @@ -28,7 +28,7 @@ * GL_MAX_TEXTURE_LAYERS layers. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/api-drawpixels.c b/tests/spec/ext_texture_integer/api-drawpixels.c index 8b0492eff..7545416b0 100644 --- a/tests/spec/ext_texture_integer/api-drawpixels.c +++ b/tests/spec/ext_texture_integer/api-drawpixels.c @@ -56,7 +56,7 @@ * specification and check that impleentations follow that. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/api-readpixels.c b/tests/spec/ext_texture_integer/api-readpixels.c index 59cf5bb04..c9409aabf 100644 --- a/tests/spec/ext_texture_integer/api-readpixels.c +++ b/tests/spec/ext_texture_integer/api-readpixels.c @@ -28,7 +28,7 @@ * Tests GL_EXT_texture_integer's error behavior with glReadPixels(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/api-teximage.c b/tests/spec/ext_texture_integer/api-teximage.c index 8f9f82a21..d8ba4148b 100644 --- a/tests/spec/ext_texture_integer/api-teximage.c +++ b/tests/spec/ext_texture_integer/api-teximage.c @@ -28,7 +28,7 @@ * Tests GL_EXT_texture_integer's error behavior with glTexImage2D(). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/fbo-blending.c b/tests/spec/ext_texture_integer/fbo-blending.c index f07e9c6b5..4ba3cf457 100644 --- a/tests/spec/ext_texture_integer/fbo-blending.c +++ b/tests/spec/ext_texture_integer/fbo-blending.c @@ -40,7 +40,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c b/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c index 7a5c7eda5..df3e71a0d 100644 --- a/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c +++ b/tests/spec/ext_texture_integer/fbo-integer-precision-clear.c @@ -32,7 +32,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c b/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c index 97ed32fbc..9b97b063f 100644 --- a/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c +++ b/tests/spec/ext_texture_integer/fbo-integer-readpixels-sint-uint.c @@ -32,7 +32,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/getteximage-clamping.c b/tests/spec/ext_texture_integer/getteximage-clamping.c index ed3daedb1..0f031eea1 100644 --- a/tests/spec/ext_texture_integer/getteximage-clamping.c +++ b/tests/spec/ext_texture_integer/getteximage-clamping.c @@ -44,7 +44,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_texture_integer/texture-integer-glsl130.c b/tests/spec/ext_texture_integer/texture-integer-glsl130.c index 8f17bfb22..49b2f0ef1 100644 --- a/tests/spec/ext_texture_integer/texture-integer-glsl130.c +++ b/tests/spec/ext_texture_integer/texture-integer-glsl130.c @@ -28,7 +28,7 @@ * simpler test modified for GLSL1.30 by airlied */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/ext_timer_query/time-elapsed.c b/tests/spec/ext_timer_query/time-elapsed.c index 2df5fc00d..09be416e1 100644 --- a/tests/spec/ext_timer_query/time-elapsed.c +++ b/tests/spec/ext_timer_query/time-elapsed.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file time-elapsed.c diff --git a/tests/spec/ext_transform_feedback/alignment.c b/tests/spec/ext_transform_feedback/alignment.c index 9e8bc72cb..9e8695993 100644 --- a/tests/spec/ext_transform_feedback/alignment.c +++ b/tests/spec/ext_transform_feedback/alignment.c @@ -32,7 +32,7 @@ * glBindBufferRange(). This value may be 0, 4, 8, or 12. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define BUFFER_SIZE 0x40 diff --git a/tests/spec/ext_transform_feedback/api-errors.c b/tests/spec/ext_transform_feedback/api-errors.c index c73748a1a..4e015bc61 100644 --- a/tests/spec/ext_transform_feedback/api-errors.c +++ b/tests/spec/ext_transform_feedback/api-errors.c @@ -48,7 +48,7 @@ * implementation is not overly aggressive in flagging errors. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/buffer-usage.c b/tests/spec/ext_transform_feedback/buffer-usage.c index 6dd0e62fb..0e9de31fa 100644 --- a/tests/spec/ext_transform_feedback/buffer-usage.c +++ b/tests/spec/ext_transform_feedback/buffer-usage.c @@ -28,7 +28,7 @@ * segfault on certain buffer object allocation 'usage' arguments. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define NUM_POINTS 10002 #define SHIFT_COUNT 64 diff --git a/tests/spec/ext_transform_feedback/builtin-varyings.c b/tests/spec/ext_transform_feedback/builtin-varyings.c index 7faecd5a6..5f799482c 100644 --- a/tests/spec/ext_transform_feedback/builtin-varyings.c +++ b/tests/spec/ext_transform_feedback/builtin-varyings.c @@ -32,7 +32,7 @@ * them. Same for gl_FrontSecondaryColor and gl_BackSecondaryColor. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/discard-api.c b/tests/spec/ext_transform_feedback/discard-api.c index 24c04d759..8cac71d3d 100644 --- a/tests/spec/ext_transform_feedback/discard-api.c +++ b/tests/spec/ext_transform_feedback/discard-api.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-api.c diff --git a/tests/spec/ext_transform_feedback/discard-bitmap.c b/tests/spec/ext_transform_feedback/discard-bitmap.c index 45b01f4bb..136e62f49 100644 --- a/tests/spec/ext_transform_feedback/discard-bitmap.c +++ b/tests/spec/ext_transform_feedback/discard-bitmap.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-bitmap.c diff --git a/tests/spec/ext_transform_feedback/discard-clear.c b/tests/spec/ext_transform_feedback/discard-clear.c index a3e99a6b0..8cd79e646 100644 --- a/tests/spec/ext_transform_feedback/discard-clear.c +++ b/tests/spec/ext_transform_feedback/discard-clear.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-clear.c diff --git a/tests/spec/ext_transform_feedback/discard-copypixels.c b/tests/spec/ext_transform_feedback/discard-copypixels.c index beb196e83..17628cbee 100644 --- a/tests/spec/ext_transform_feedback/discard-copypixels.c +++ b/tests/spec/ext_transform_feedback/discard-copypixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-copypixels.c diff --git a/tests/spec/ext_transform_feedback/discard-drawarrays.c b/tests/spec/ext_transform_feedback/discard-drawarrays.c index 87a76881a..943f206b8 100644 --- a/tests/spec/ext_transform_feedback/discard-drawarrays.c +++ b/tests/spec/ext_transform_feedback/discard-drawarrays.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-drawarrays.c diff --git a/tests/spec/ext_transform_feedback/discard-drawpixels.c b/tests/spec/ext_transform_feedback/discard-drawpixels.c index 08cc4e4c8..54fe8523a 100644 --- a/tests/spec/ext_transform_feedback/discard-drawpixels.c +++ b/tests/spec/ext_transform_feedback/discard-drawpixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file discard-drawpixels.c diff --git a/tests/spec/ext_transform_feedback/generatemipmap.c b/tests/spec/ext_transform_feedback/generatemipmap.c index 1ee255f84..3fa355681 100644 --- a/tests/spec/ext_transform_feedback/generatemipmap.c +++ b/tests/spec/ext_transform_feedback/generatemipmap.c @@ -62,7 +62,7 @@ * tests/fbo/fbo-generatemipmap.c. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define TEX_WIDTH 256 #define TEX_HEIGHT 256 diff --git a/tests/spec/ext_transform_feedback/get-buffer-state.c b/tests/spec/ext_transform_feedback/get-buffer-state.c index 6102c2ce2..1f70b5e96 100644 --- a/tests/spec/ext_transform_feedback/get-buffer-state.c +++ b/tests/spec/ext_transform_feedback/get-buffer-state.c @@ -28,7 +28,7 @@ * transform feedback buffers. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/immediate-reuse.c b/tests/spec/ext_transform_feedback/immediate-reuse.c index 9b836f086..daad7c472 100644 --- a/tests/spec/ext_transform_feedback/immediate-reuse.c +++ b/tests/spec/ext_transform_feedback/immediate-reuse.c @@ -36,7 +36,7 @@ * a stepped gradient being drawn. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 256 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/interleaved.c b/tests/spec/ext_transform_feedback/interleaved.c index 795694e73..1bf6eea4d 100644 --- a/tests/spec/ext_transform_feedback/interleaved.c +++ b/tests/spec/ext_transform_feedback/interleaved.c @@ -27,7 +27,7 @@ * Test writing interleaved vertex attribs into a buffer object. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/intervening-read.c b/tests/spec/ext_transform_feedback/intervening-read.c index 161c2593d..05e53352e 100644 --- a/tests/spec/ext_transform_feedback/intervening-read.c +++ b/tests/spec/ext_transform_feedback/intervening-read.c @@ -46,7 +46,7 @@ * doesn't interfere with overflow checking. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/max-varyings.c b/tests/spec/ext_transform_feedback/max-varyings.c index 2048cbb3d..78c46a300 100644 --- a/tests/spec/ext_transform_feedback/max-varyings.c +++ b/tests/spec/ext_transform_feedback/max-varyings.c @@ -37,7 +37,7 @@ * possible lengths and offsets. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define MAX_VARYING 32 diff --git a/tests/spec/ext_transform_feedback/negative-prims.c b/tests/spec/ext_transform_feedback/negative-prims.c index cee33db34..13366bc39 100644 --- a/tests/spec/ext_transform_feedback/negative-prims.c +++ b/tests/spec/ext_transform_feedback/negative-prims.c @@ -41,7 +41,7 @@ * primitives) */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 32 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/order.c b/tests/spec/ext_transform_feedback/order.c index 0d3b79414..6ddea4f0e 100644 --- a/tests/spec/ext_transform_feedback/order.c +++ b/tests/spec/ext_transform_feedback/order.c @@ -52,7 +52,7 @@ * "triangles", "lines", or "points". */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define NUM_POINTS 10002 #define SHIFT_COUNT 64 diff --git a/tests/spec/ext_transform_feedback/output-type.c b/tests/spec/ext_transform_feedback/output-type.c index 43e8a9ba9..8b82a1ff6 100644 --- a/tests/spec/ext_transform_feedback/output-type.c +++ b/tests/spec/ext_transform_feedback/output-type.c @@ -28,7 +28,7 @@ * works as expected. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/overflow-edge-cases.c b/tests/spec/ext_transform_feedback/overflow-edge-cases.c index 2e23e1962..233abf970 100644 --- a/tests/spec/ext_transform_feedback/overflow-edge-cases.c +++ b/tests/spec/ext_transform_feedback/overflow-edge-cases.c @@ -41,7 +41,7 @@ * - GL_PRIMITIVES_GENERATED is set correctly. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 16 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/position.c b/tests/spec/ext_transform_feedback/position.c index 603ae24e5..5f368bf33 100644 --- a/tests/spec/ext_transform_feedback/position.c +++ b/tests/spec/ext_transform_feedback/position.c @@ -28,7 +28,7 @@ * BindBufferOffset, BindBufferRange, GL_RASTERIZER_DISCARD, and related queries. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/separate.c b/tests/spec/ext_transform_feedback/separate.c index 1dc946de2..868fbe65f 100644 --- a/tests/spec/ext_transform_feedback/separate.c +++ b/tests/spec/ext_transform_feedback/separate.c @@ -27,7 +27,7 @@ * Test writing separate vertex attribs into a buffer object. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/ext_transform_feedback/tessellation.c b/tests/spec/ext_transform_feedback/tessellation.c index 8c79e45dc..9b52a2fdd 100644 --- a/tests/spec/ext_transform_feedback/tessellation.c +++ b/tests/spec/ext_transform_feedback/tessellation.c @@ -116,7 +116,7 @@ * failures. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define BUFFER_SIZE 20 diff --git a/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c b/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c index c35581874..f83b3f8cb 100644 --- a/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c +++ b/tests/spec/ext_unpack_subimage/ext_unpack_subimage.c @@ -30,7 +30,7 @@ #include <EGL/egl.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-2.0/api/clip-flag-behavior.c b/tests/spec/gl-2.0/api/clip-flag-behavior.c index 64639cd79..0fb085261 100644 --- a/tests/spec/gl-2.0/api/clip-flag-behavior.c +++ b/tests/spec/gl-2.0/api/clip-flag-behavior.c @@ -36,7 +36,7 @@ * glDisable is consistent. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-2.0/api/getattriblocation-conventional.c b/tests/spec/gl-2.0/api/getattriblocation-conventional.c index 14ab5516c..8f769eb05 100644 --- a/tests/spec/gl-2.0/api/getattriblocation-conventional.c +++ b/tests/spec/gl-2.0/api/getattriblocation-conventional.c @@ -28,7 +28,7 @@ * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-2.0/vertex-program-two-side.c b/tests/spec/gl-2.0/vertex-program-two-side.c index 77a4a43c7..5014751e3 100644 --- a/tests/spec/gl-2.0/vertex-program-two-side.c +++ b/tests/spec/gl-2.0/vertex-program-two-side.c @@ -43,7 +43,7 @@ */ #define _GNU_SOURCE -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-2.1/minmax.c b/tests/spec/gl-2.1/minmax.c index 6970ad3b2..edb32a23c 100644 --- a/tests/spec/gl-2.1/minmax.c +++ b/tests/spec/gl-2.1/minmax.c @@ -26,7 +26,7 @@ * of the GL 2.1 spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c index 37e81e7d8..b6dbfc786 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c +++ b/tests/spec/gl-3.0/api/bindfragdata-invalid-parameters.c @@ -27,7 +27,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/bindfragdata-link-error.c b/tests/spec/gl-3.0/api/bindfragdata-link-error.c index cdf67f3f9..0e87cf7e9 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-link-error.c +++ b/tests/spec/gl-3.0/api/bindfragdata-link-error.c @@ -25,7 +25,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c index f8242cb91..8a87ffcad 100644 --- a/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c +++ b/tests/spec/gl-3.0/api/bindfragdata-nonexistent-variable.c @@ -26,7 +26,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/clearbuffer-common.c b/tests/spec/gl-3.0/api/clearbuffer-common.c index f421b6356..f016b5866 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-common.c +++ b/tests/spec/gl-3.0/api/clearbuffer-common.c @@ -24,7 +24,7 @@ * \file clearbuffer-common.c * Common code and data for the basic glClearBuffer tests */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" const float default_color[4] = { 0.2, 0.4, 0.6, 1.0 }; const float default_depth = 0.2; diff --git a/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c b/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c index 87fc6c4eb..a15a421a5 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c +++ b/tests/spec/gl-3.0/api/clearbuffer-depth-stencil.c @@ -47,7 +47,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/clearbuffer-depth.c b/tests/spec/gl-3.0/api/clearbuffer-depth.c index 08d9e3518..3bd549107 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-depth.c +++ b/tests/spec/gl-3.0/api/clearbuffer-depth.c @@ -47,7 +47,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/clearbuffer-display-lists.c b/tests/spec/gl-3.0/api/clearbuffer-display-lists.c index 7924f911a..621fd817e 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-display-lists.c +++ b/tests/spec/gl-3.0/api/clearbuffer-display-lists.c @@ -31,7 +31,7 @@ * \author Anuj Phogat */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c index 3a6b4a6d5..a81c53ea4 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c @@ -26,7 +26,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c index 2a915c143..4ab765bce 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c +++ b/tests/spec/gl-3.0/api/clearbuffer-invalid-drawbuffer.c @@ -27,7 +27,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c b/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c index de230eb12..016d765ed 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c +++ b/tests/spec/gl-3.0/api/clearbuffer-mixed-format.c @@ -44,7 +44,7 @@ * \author Anuj Phogat */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" #define COUNT ARRAY_SIZE(test_vectors) diff --git a/tests/spec/gl-3.0/api/clearbuffer-stencil.c b/tests/spec/gl-3.0/api/clearbuffer-stencil.c index e0420e76a..a31d1a2a0 100644 --- a/tests/spec/gl-3.0/api/clearbuffer-stencil.c +++ b/tests/spec/gl-3.0/api/clearbuffer-stencil.c @@ -47,7 +47,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "clearbuffer-common.h" void piglit_init(int argc, char **argv) diff --git a/tests/spec/gl-3.0/api/getfragdatalocation.c b/tests/spec/gl-3.0/api/getfragdatalocation.c index 25897f596..a85bae9ce 100644 --- a/tests/spec/gl-3.0/api/getfragdatalocation.c +++ b/tests/spec/gl-3.0/api/getfragdatalocation.c @@ -25,7 +25,7 @@ * * \author Ian Romanick */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/gl-3.0/api/integer-errors.c b/tests/spec/gl-3.0/api/integer-errors.c index f26e59287..90e330a38 100644 --- a/tests/spec/gl-3.0/api/integer-errors.c +++ b/tests/spec/gl-3.0/api/integer-errors.c @@ -28,7 +28,7 @@ */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN(100 /*window_width*/, 100 /*window_height*/, diff --git a/tests/spec/gl-3.0/minmax.c b/tests/spec/gl-3.0/minmax.c index 8e2da7877..7bcf83ab9 100644 --- a/tests/spec/gl-3.0/minmax.c +++ b/tests/spec/gl-3.0/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.0 spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c index d36f1c3af..4c87a371c 100644 --- a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c +++ b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "sized-internalformats.h" /** diff --git a/tests/spec/gl-3.0/required-sized-texture-formats.c b/tests/spec/gl-3.0/required-sized-texture-formats.c index a8989b656..21c7849a1 100644 --- a/tests/spec/gl-3.0/required-sized-texture-formats.c +++ b/tests/spec/gl-3.0/required-sized-texture-formats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "sized-internalformats.h" /** diff --git a/tests/spec/gl-3.0/required-texture-attachment-formats.c b/tests/spec/gl-3.0/required-texture-attachment-formats.c index 7b64d8cc2..1850ab397 100644 --- a/tests/spec/gl-3.0/required-texture-attachment-formats.c +++ b/tests/spec/gl-3.0/required-texture-attachment-formats.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "sized-internalformats.h" /** diff --git a/tests/spec/gl-3.0/texture-integer.c b/tests/spec/gl-3.0/texture-integer.c index 7cc65a57d..4fad5e1a5 100644 --- a/tests/spec/gl-3.0/texture-integer.c +++ b/tests/spec/gl-3.0/texture-integer.c @@ -27,7 +27,7 @@ * Tests OpenGL 3.0 integer textures */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN(100 /*window_width*/, 100 /*window_height*/, diff --git a/tests/spec/gl-3.1/minmax.c b/tests/spec/gl-3.1/minmax.c index 776361221..0f823262c 100644 --- a/tests/spec/gl-3.1/minmax.c +++ b/tests/spec/gl-3.1/minmax.c @@ -26,7 +26,7 @@ * of the GL 3.1 spec. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "minmax-test.h" PIGLIT_GL_TEST_MAIN( diff --git a/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c b/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c index d38c2a796..9fed5b6a0 100644 --- a/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c +++ b/tests/spec/glsl-1.10/execution/clipping/clip-plane-transformation.c @@ -168,7 +168,7 @@ * it does in fixed function mode. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c b/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c index 601fb508e..1ff270ba0 100644 --- a/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c +++ b/tests/spec/glsl-1.10/execution/glsl-render-after-bad-attach.c @@ -31,7 +31,7 @@ * shader to it still works. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/glsl-1.20/recursion/recursion.c b/tests/spec/glsl-1.20/recursion/recursion.c index 21cae9daf..9887d4f55 100644 --- a/tests/spec/glsl-1.20/recursion/recursion.c +++ b/tests/spec/glsl-1.20/recursion/recursion.c @@ -47,7 +47,7 @@ * * \author Ian Romanick <ian.d.romanick@intel.com> */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c index 85a16e5a0..e2a5912af 100644 --- a/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c +++ b/tests/spec/glsl-1.30/execution/clipping/max-clip-distances.c @@ -57,7 +57,7 @@ * defined in the vertex and fragment shaders, and that this value is * at least 8. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c index cee94c8d2..52f1ba5d0 100644 --- a/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c +++ b/tests/spec/glsl-1.30/execution/fs-discard-exit-2.c @@ -42,7 +42,7 @@ * 2x2 subspan aligned). */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 64 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c index e1baac363..ba7f7ca6a 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c @@ -29,7 +29,7 @@ * Creates a mipmapped 64x32 2D texture and draws a series of squares whose * color contains a texel fetched from each quadrant of the rgbw texture. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 90 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c index fac1c462e..5211377f2 100644 --- a/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c +++ b/tests/spec/glsl-1.30/execution/fs-texelFetchOffset-2D.c @@ -29,7 +29,7 @@ * Creates a mipmapped 64x32 2D texture and draws a series of squares whose * color contains a texel fetched from each quadrant of the rgbw texture. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 90 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c index d638cf5a7..8d7865e46 100644 --- a/tests/spec/glsl-1.30/execution/isinf-and-isnan.c +++ b/tests/spec/glsl-1.30/execution/isinf-and-isnan.c @@ -108,7 +108,7 @@ * out of the shader. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/vertexid-beginend.c b/tests/spec/glsl-1.30/execution/vertexid-beginend.c index 0b0198e18..8a5aa94d0 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-beginend.c +++ b/tests/spec/glsl-1.30/execution/vertexid-beginend.c @@ -27,7 +27,7 @@ * Test that gl_VertexID has the correct values. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c b/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c index ce5a432a3..8c62e8b76 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c +++ b/tests/spec/glsl-1.30/execution/vertexid-drawarrays.c @@ -27,7 +27,7 @@ * Test that gl_VertexID has the correct values. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, diff --git a/tests/spec/glsl-1.30/execution/vertexid-drawelements.c b/tests/spec/glsl-1.30/execution/vertexid-drawelements.c index 6c8f6980f..f197eff1f 100644 --- a/tests/spec/glsl-1.30/execution/vertexid-drawelements.c +++ b/tests/spec/glsl-1.30/execution/vertexid-drawelements.c @@ -27,7 +27,7 @@ * Test that gl_VertexID has the correct values. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 70 /*window_width*/, diff --git a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c index 60f9d836a..3210830f3 100644 --- a/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c +++ b/tests/spec/glsl-1.30/linker/clipping/mixing-clip-distance-and-clip-vertex-disallowed.c @@ -34,7 +34,7 @@ * contains writes to both variables, even if those writes would never * both occur in the same render. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/glsl-1.30/texel-offset-limits.c b/tests/spec/glsl-1.30/texel-offset-limits.c index fe8f13056..17119d7d3 100644 --- a/tests/spec/glsl-1.30/texel-offset-limits.c +++ b/tests/spec/glsl-1.30/texel-offset-limits.c @@ -28,7 +28,7 @@ * Tests that GLSL 1.30 exposes the GL_MIN/MAX_PROGRAM_OFFSET_LIMITS. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 10 /*window_width*/, diff --git a/tests/spec/glsl-1.40/tf-no-position.c b/tests/spec/glsl-1.40/tf-no-position.c index 50b475883..16927f8aa 100644 --- a/tests/spec/glsl-1.40/tf-no-position.c +++ b/tests/spec/glsl-1.40/tf-no-position.c @@ -28,7 +28,7 @@ * using EXT_transform_feedback to get results. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define BUFFER_SIZE 4 diff --git a/tests/spec/glx_arb_create_context/common.c b/tests/spec/glx_arb_create_context/common.c index be002560a..7188a6639 100644 --- a/tests/spec/glx_arb_create_context/common.c +++ b/tests/spec/glx_arb_create_context/common.c @@ -21,7 +21,7 @@ */ #include <ctype.h> #include <errno.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/default-major-version.c b/tests/spec/glx_arb_create_context/default-major-version.c index 84de99058..50b5ff639 100644 --- a/tests/spec/glx_arb_create_context/default-major-version.c +++ b/tests/spec/glx_arb_create_context/default-major-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/default-minor-version.c b/tests/spec/glx_arb_create_context/default-minor-version.c index c0060393f..69a7ecf68 100644 --- a/tests/spec/glx_arb_create_context/default-minor-version.c +++ b/tests/spec/glx_arb_create_context/default-minor-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-attribute.c b/tests/spec/glx_arb_create_context/invalid-attribute.c index 88a581b72..3b7ac36d8 100644 --- a/tests/spec/glx_arb_create_context/invalid-attribute.c +++ b/tests/spec/glx_arb_create_context/invalid-attribute.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c b/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c index 1da602f9a..0e023194d 100644 --- a/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c +++ b/tests/spec/glx_arb_create_context/invalid-flag-forward-compatible.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-flag.c b/tests/spec/glx_arb_create_context/invalid-flag.c index 60ac2d9ea..adae14358 100644 --- a/tests/spec/glx_arb_create_context/invalid-flag.c +++ b/tests/spec/glx_arb_create_context/invalid-flag.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-gl-version.c b/tests/spec/glx_arb_create_context/invalid-gl-version.c index 7451159ec..501504f25 100644 --- a/tests/spec/glx_arb_create_context/invalid-gl-version.c +++ b/tests/spec/glx_arb_create_context/invalid-gl-version.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c b/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c index 50c44a399..130222f51 100644 --- a/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c +++ b/tests/spec/glx_arb_create_context/invalid-render-type-color-index.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/invalid-render-type.c b/tests/spec/glx_arb_create_context/invalid-render-type.c index a6ffa1ef7..5ceca05f3 100644 --- a/tests/spec/glx_arb_create_context/invalid-render-type.c +++ b/tests/spec/glx_arb_create_context/invalid-render-type.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/valid-attribute-empty.c b/tests/spec/glx_arb_create_context/valid-attribute-empty.c index 5cfc37ec6..22d94a3e8 100644 --- a/tests/spec/glx_arb_create_context/valid-attribute-empty.c +++ b/tests/spec/glx_arb_create_context/valid-attribute-empty.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/valid-attribute-null.c b/tests/spec/glx_arb_create_context/valid-attribute-null.c index 32ab49b8d..2ab853a7a 100644 --- a/tests/spec/glx_arb_create_context/valid-attribute-null.c +++ b/tests/spec/glx_arb_create_context/valid-attribute-null.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c b/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c index 17f408dd7..6b3e173d1 100644 --- a/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c +++ b/tests/spec/glx_arb_create_context/valid-flag-forward-compatible.c @@ -19,7 +19,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/common.c b/tests/spec/glx_ext_import_context/common.c index d3318bf9a..9048472b6 100644 --- a/tests/spec/glx_ext_import_context/common.c +++ b/tests/spec/glx_ext_import_context/common.c @@ -21,7 +21,7 @@ */ #include <assert.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/free-context.c b/tests/spec/glx_ext_import_context/free-context.c index 5bad0ff4f..8f1861096 100644 --- a/tests/spec/glx_ext_import_context/free-context.c +++ b/tests/spec/glx_ext_import_context/free-context.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/get-context-id.c b/tests/spec/glx_ext_import_context/get-context-id.c index 26bfaadc5..7b78091de 100644 --- a/tests/spec/glx_ext_import_context/get-context-id.c +++ b/tests/spec/glx_ext_import_context/get-context-id.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/get-current-display.c b/tests/spec/glx_ext_import_context/get-current-display.c index fc6fcdbf6..342aac178 100644 --- a/tests/spec/glx_ext_import_context/get-current-display.c +++ b/tests/spec/glx_ext_import_context/get-current-display.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c b/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c index 297d91a3f..eb7b70811 100644 --- a/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c +++ b/tests/spec/glx_ext_import_context/import-context-has-same-context-id.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/import-context-multi-process.c b/tests/spec/glx_ext_import_context/import-context-multi-process.c index eec28b27d..8ffda55ad 100644 --- a/tests/spec/glx_ext_import_context/import-context-multi-process.c +++ b/tests/spec/glx_ext_import_context/import-context-multi-process.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/import-context-single-process.c b/tests/spec/glx_ext_import_context/import-context-single-process.c index ead037490..7b4a75918 100644 --- a/tests/spec/glx_ext_import_context/import-context-single-process.c +++ b/tests/spec/glx_ext_import_context/import-context-single-process.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/make-current-multi-process.c b/tests/spec/glx_ext_import_context/make-current-multi-process.c index a4c765cd3..db93354ec 100644 --- a/tests/spec/glx_ext_import_context/make-current-multi-process.c +++ b/tests/spec/glx_ext_import_context/make-current-multi-process.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/make-current-single-process.c b/tests/spec/glx_ext_import_context/make-current-single-process.c index d3a0fb8fa..ae15c2b18 100644 --- a/tests/spec/glx_ext_import_context/make-current-single-process.c +++ b/tests/spec/glx_ext_import_context/make-current-single-process.c @@ -24,7 +24,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/glx_ext_import_context/query-context-info.c b/tests/spec/glx_ext_import_context/query-context-info.c index 2be20132a..84e225aff 100644 --- a/tests/spec/glx_ext_import_context/query-context-info.c +++ b/tests/spec/glx_ext_import_context/query-context-info.c @@ -20,7 +20,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #include "piglit-glx-util.h" #include "common.h" diff --git a/tests/spec/nv_conditional_render/begin-while-active.c b/tests/spec/nv_conditional_render/begin-while-active.c index d16869ba7..a1363230b 100644 --- a/tests/spec/nv_conditional_render/begin-while-active.c +++ b/tests/spec/nv_conditional_render/begin-while-active.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file begin-while-active.c diff --git a/tests/spec/nv_conditional_render/begin-zero.c b/tests/spec/nv_conditional_render/begin-zero.c index 008a7ce48..5a8177522 100644 --- a/tests/spec/nv_conditional_render/begin-zero.c +++ b/tests/spec/nv_conditional_render/begin-zero.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file begin-zero.c diff --git a/tests/spec/nv_conditional_render/bitmap.c b/tests/spec/nv_conditional_render/bitmap.c index 3f35f3f6e..af38ca03c 100644 --- a/tests/spec/nv_conditional_render/bitmap.c +++ b/tests/spec/nv_conditional_render/bitmap.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file bitmap.c diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c index 48367ee01..77269fc23 100644 --- a/tests/spec/nv_conditional_render/blitframebuffer.c +++ b/tests/spec/nv_conditional_render/blitframebuffer.c @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file blitframebuffer.c diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c index face8f466..aefeed9e1 100644 --- a/tests/spec/nv_conditional_render/clear.c +++ b/tests/spec/nv_conditional_render/clear.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file clear.c diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c index 2d17d35e8..59b732e16 100644 --- a/tests/spec/nv_conditional_render/copypixels.c +++ b/tests/spec/nv_conditional_render/copypixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file copypixels.c diff --git a/tests/spec/nv_conditional_render/copyteximage.c b/tests/spec/nv_conditional_render/copyteximage.c index 81c8ac98b..a014d1dea 100644 --- a/tests/spec/nv_conditional_render/copyteximage.c +++ b/tests/spec/nv_conditional_render/copyteximage.c @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file copyteximage.c diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c index debdeeebd..3449fa052 100644 --- a/tests/spec/nv_conditional_render/copytexsubimage.c +++ b/tests/spec/nv_conditional_render/copytexsubimage.c @@ -22,7 +22,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file copytexsubimage.c diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/dlist.c index 844e15bb5..fe6265036 100644 --- a/tests/spec/nv_conditional_render/dlist.c +++ b/tests/spec/nv_conditional_render/dlist.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file dlist.c diff --git a/tests/spec/nv_conditional_render/drawpixels.c b/tests/spec/nv_conditional_render/drawpixels.c index d100712c6..ddb45108e 100644 --- a/tests/spec/nv_conditional_render/drawpixels.c +++ b/tests/spec/nv_conditional_render/drawpixels.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file drawpixels.c diff --git a/tests/spec/nv_conditional_render/generatemipmap.c b/tests/spec/nv_conditional_render/generatemipmap.c index 5ac8f6db5..8c55e9ae3 100644 --- a/tests/spec/nv_conditional_render/generatemipmap.c +++ b/tests/spec/nv_conditional_render/generatemipmap.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file generatemipmap.c diff --git a/tests/spec/nv_conditional_render/vertex_array.c b/tests/spec/nv_conditional_render/vertex_array.c index f8e64a022..b75c147b5 100644 --- a/tests/spec/nv_conditional_render/vertex_array.c +++ b/tests/spec/nv_conditional_render/vertex_array.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" /** * @file vertex_array.c diff --git a/tests/spec/nv_texture_barrier/blending-in-shader.c b/tests/spec/nv_texture_barrier/blending-in-shader.c index 334ef0742..d3d1642cc 100644 --- a/tests/spec/nv_texture_barrier/blending-in-shader.c +++ b/tests/spec/nv_texture_barrier/blending-in-shader.c @@ -27,7 +27,7 @@ * Test programmable blending with GL_NV_texture_barrier. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 128 /*window_width*/, diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c index 6fa8b0101..58d8d04fc 100644 --- a/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c +++ b/tests/spec/oes_compressed_etc1_rgb8_texture/oes_compressed_etc1_rgb8_texture-basic.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #ifndef GL_OES_compressed_ETC1_RGB8_texture #define GL_ETC1_RGB8_OES 0x8D64 diff --git a/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c b/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c index 21ecee993..4d433c3ed 100644 --- a/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c +++ b/tests/spec/oes_compressed_paletted_texture/oes_compressed_paletted_texture-api.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "piglit-util.h" +#include "piglit-util-gl-common.h" PIGLIT_GL_TEST_MAIN( 100 /*window_width*/, diff --git a/tests/spec/oes_draw_texture/oes_draw_texture.c b/tests/spec/oes_draw_texture/oes_draw_texture.c index e81c2452b..ff6068393 100644 --- a/tests/spec/oes_draw_texture/oes_draw_texture.c +++ b/tests/spec/oes_draw_texture/oes_draw_texture.c @@ -30,7 +30,7 @@ #include <EGL/egl.h> -#include "piglit-util.h" +#include "piglit-util-gl-common.h" #define TEXTURE_SIZE 2 |