This series is on my framework-gl-v22 branch. It is 1.6 MB worth of patches,
so I expect some patches to be dropped by the mailing list. For reference,
the point where it diverges from master is my framework-gl-v22-base branch.
[git://people.freedesktop.org/~chadversary/piglit.git].
If you want to skip to the good stuff, see the last patch. It's a one-liner
patch that enables gl-3.1/minmax to run under a GL 3.1 core context.
Adding support for GL core contexts was no simple fix. Doing it in
a cross-platform way required replacing the GL test framework
(piglit-framework.c) with something... much larger.
As a nice unexpected side-effect, in addition to supporting GL core contexts
this series also removes some, but not all, obstacles preventing Piglit from
running on Android.
On Linux with Sandybridge, I thoroughly checked for possible regressions by
performing three test runs:
1. On framework-gl-v22-base with USE_WAFFLE=0.
2. On framework-gl-v22 with PIGLIT_USE_WAFFLE=0.
3. On framework-gl-v22 with PIGLIT_USE_WAFFLE=1.
>From 1 -> 2 there was no delta in test results other than spurious failures
due to a concurrent test run. From 2 -> 3 there were no regressions, and two
tests begin skipping (fbo-depth-sample-compare and windowoverlap).
If you want to test this patch series on Linux, you first need to install
Waffle. I suggest installing the 1.0 release branch.
git clone -b 1.0 git://people.freedesktop.org/~chadversary/waffle.git
~/waffle
cd ~/waffle
cmake . \
-DCMAKE_BUILD_TYPE=Debug \ # Or Release, your choice.
-DCMAKE_INSTALL_PREFIX=/usr/local \ # Or wherever Piglit will find it.
-Dwaffle_has_glx=1 \ # For GLX support.
-Dwaffle_has_x11_egl=1 \ # For X11/EGL support.
-Dwaffle_has_wayland=1 \ # For Wayland support.
make
sudo make install
Patches 1-7 remove all use of GLUT from all tests except
fbo-depth-sample-compare (which uses glutSolidSphere) and windowoverlap (which
uses GLUT to set up overlapping windows and should really be a GLX test).
Killing GLUT is necessary because some of the new frameworks don't use it.
Patch 8 changes the test result from FAIL to SKIP if a test executable is no
longer built. This will be the case for fbo-depth-sample-compare and
windowoverlap for many users.
Patches 9-20 replaces the old GL test framework (piglit-framework.c) with
a new one. If you build with PIGLIT_USE_WAFFLE=0, then your tests will use
piglit_glut_framework. This is currently the only option on non-Linux builds.
If you build with PIGLIT_USE_WAFFLE=1, you get these new shiny frameworks:
piglit_fbo_framework: for tests run under -fbo mode
piglit_x11_framework: for tests in non-fbo mode on X11
piglit_wl_framework: for tests in non-fbo mode on Wayland
Patch 18 makes Waffle a build requirement by default on Linux. Why? Because
testers should be using the Waffle-backed frameworks. Without them, you don't
get concurrent test runs, tests are incapable of running in fbo mode, and
windows steal your input.
Patches 22 adds the ability for a test to declare which flavors of GL it
supports, along with a minimum version number: GL compat, GL core, ES1, ES2.
Patch 23 changes gl-3.1/minmax to declare that it supports running under GL
compat and GL 3.1 core. I haven't had a chance yet to test the GL 3.1 core
path because my test machine with the new X server is unavailable today.
Testers are welcome.
Chad Versace (23):
01 tests: Remove all uses of glutBitmapCharacter
02 texline: Convert to use piglit framework
03 tests,util: Wrap glutPostRedisplay with piglit_post_redisplay
04 tests,util: Wrap glutKeyboardFunc with piglit_set_keyboard_func
05 tests,util: Wrap glutSwapBuffers with piglit_swap_buffers
06 tests,util: Wrap glutReshapeFunc with piglit_set_reshape_func
07 util,tests: Replace GLUT visual enums with PIGLTI_GL_VISUAL enums
08 framework: Report 'skip' if test executable not found
09 tests: Remove direct includes of piglit-framework.h
10 util: Rename piglit-framework.[ch] -> piglit-framework-gl.[ch]
11 cmake: Prefix cmake options and feature macros with PIGLIT
12 util: Add wrappers for malloc and calloc that catch errors
13 util: Add Waffle utility functions
14 cmake: Define cmake flags and feature macros for X11, GLX, EGL
15 util: Rename piglit_gl_test_info -> piglit_gl_test_config
16 util: Convert GL tests to use PIGLIT_GL_CONFIG_BEGIN/END
17 util: Add new GL test frameworks
18 cmake: On Linux, require Waffle by default
19 cmake,util: Switch GL tests to use new framework
20 util,glut_waffle: Remove unused sources from old GL test framework
21 util: Remove unneeded extern
22 util: Add fields to piglit_gl_test_config for listing supported GL flavors
23 gl-3.1/minmax: Add support for running under a GL 3.1 core context
CMakeLists.txt | 60 ++-
cmake/target_api/CMakeLists.txt | 16 +-
cmake/target_api/gl/CMakeLists.txt | 10 +-
cmake/target_api/gles1/CMakeLists.txt | 3 +-
cmake/target_api/gles2/CMakeLists.txt | 3 +-
framework/exectest.py | 45 ++-
src/CMakeLists.txt | 3 -
src/glut_waffle/CMakeLists.no_api.txt | 11 -
src/glut_waffle/CMakeLists.txt | 3 -
src/glut_waffle/README.txt | 5 -
src/glut_waffle/TODO.txt | 2 -
src/glut_waffle/glut_waffle.c | 352 -----------------
src/glut_waffle/glut_waffle.h | 72 ----
src/glut_waffle/priv/common.c | 66 ----
src/glut_waffle/priv/common.h | 81 ----
src/glut_waffle/priv/x11.c | 89 -----
src/glut_waffle/priv/x11.h | 31 --
src/piglit/gl_wrap.h | 8 +-
src/piglit/glut_wrap.h | 7 +-
tests/CMakeLists.txt | 4 +-
tests/asmparsertest/asmparsertest.c | 13 +-
tests/bugs/crash-cubemap-order.c | 13 +-
tests/bugs/crash-texparameter-before-teximage.c | 13 +-
tests/bugs/drawbuffer-modes.c | 13 +-
tests/bugs/fdo10370.c | 13 +-
tests/bugs/fdo14575.c | 13 +-
tests/bugs/fdo20701.c | 13 +-
tests/bugs/fdo22540.c | 13 +-
tests/bugs/fdo23489.c | 13 +-
tests/bugs/fdo23670-depth_test.c | 13 +-
tests/bugs/fdo23670-drawpix_stencil.c | 13 +-
tests/bugs/fdo24066.c | 14 +-
tests/bugs/fdo25614-genmipmap.c | 13 +-
tests/bugs/fdo28551.c | 13 +-
tests/bugs/fdo31934.c | 13 +-
tests/bugs/fdo9833.c | 13 +-
tests/bugs/point-sprite.c | 14 +-
tests/bugs/r300-readcache.c | 14 +-
tests/bugs/tex1d-2dborder.c | 14 +-
tests/bugs/tri-tex-crash.c | 13 +-
tests/bugs/vbo-buffer-unmap.c | 14 +-
tests/fbo/CMakeLists.gl.txt | 4 +-
tests/fbo/fbo-1d.c | 13 +-
tests/fbo/fbo-3d.c | 13 +-
tests/fbo/fbo-alpha.c | 13 +-
tests/fbo/fbo-alphatest-formats.c | 13 +-
tests/fbo/fbo-alphatest-nocolor-ff.c | 13 +-
tests/fbo/fbo-alphatest-nocolor.c | 13 +-
tests/fbo/fbo-array.c | 13 +-
tests/fbo/fbo-bind-renderbuffer.c | 13 +-
tests/fbo/fbo-blending-formats.c | 13 +-
tests/fbo/fbo-blit-d24s8.c | 13 +-
tests/fbo/fbo-blit-stretch.cpp | 13 +-
tests/fbo/fbo-blit.c | 13 +-
tests/fbo/fbo-clear-formats.c | 13 +-
tests/fbo/fbo-clearmipmap.c | 13 +-
tests/fbo/fbo-colormask-formats.c | 13 +-
tests/fbo/fbo-copypix.c | 13 +-
tests/fbo/fbo-copyteximage-simple.c | 13 +-
tests/fbo/fbo-copyteximage.c | 13 +-
tests/fbo/fbo-cubemap.c | 13 +-
tests/fbo/fbo-depth-array.c | 13 +-
tests/fbo/fbo-depth-sample-compare.c | 13 +-
tests/fbo/fbo-depth-tex1d.c | 13 +-
tests/fbo/fbo-depth.c | 13 +-
tests/fbo/fbo-depthstencil.c | 13 +-
tests/fbo/fbo-depthtex.c | 13 +-
tests/fbo/fbo-deriv.c | 13 +-
tests/fbo/fbo-draw-buffers-blend.c | 14 +-
tests/fbo/fbo-drawbuffers-arbfp.c | 13 +-
tests/fbo/fbo-drawbuffers-blend-add.c | 13 +-
tests/fbo/fbo-drawbuffers-fragcolor.c | 13 +-
tests/fbo/fbo-drawbuffers-maxtargets.c | 13 +-
tests/fbo/fbo-drawbuffers.c | 13 +-
tests/fbo/fbo-drawbuffers2-blend.c | 13 +-
tests/fbo/fbo-drawbuffers2-colormask.c | 13 +-
tests/fbo/fbo-finish-deleted.c | 13 +-
tests/fbo/fbo-flushing-2.c | 14 +-
tests/fbo/fbo-flushing.c | 14 +-
tests/fbo/fbo-formats.h | 2 +-
tests/fbo/fbo-fragcoord.c | 13 +-
tests/fbo/fbo-fragcoord2.c | 14 +-
tests/fbo/fbo-generatemipmap-array.c | 13 +-
tests/fbo/fbo-generatemipmap-filtering.c | 13 +-
tests/fbo/fbo-generatemipmap-formats.c | 15 +-
tests/fbo/fbo-generatemipmap-noimage.c | 13 +-
tests/fbo/fbo-generatemipmap-nonsquare.c | 13 +-
tests/fbo/fbo-generatemipmap-npot.c | 13 +-
tests/fbo/fbo-generatemipmap-scissor.c | 13 +-
tests/fbo/fbo-generatemipmap-viewport.c | 13 +-
tests/fbo/fbo-generatemipmap.c | 13 +-
.../fbo/fbo-getframebufferattachmentparameter-01.c | 13 +-
tests/fbo/fbo-gl_pointcoord.c | 13 +-
tests/fbo/fbo-incomplete-texture-01.c | 13 +-
tests/fbo/fbo-incomplete-texture-02.c | 13 +-
tests/fbo/fbo-incomplete-texture-03.c | 13 +-
tests/fbo/fbo-incomplete-texture-04.c | 13 +-
tests/fbo/fbo-integer.c | 13 +-
tests/fbo/fbo-luminance-alpha.c | 13 +-
tests/fbo/fbo-maxsize.c | 13 +-
tests/fbo/fbo-mipmap-copypix.c | 13 +-
tests/fbo/fbo-nodepth-test.c | 13 +-
tests/fbo/fbo-nostencil-test.c | 13 +-
tests/fbo/fbo-pbo-readpixels-small.c | 13 +-
tests/fbo/fbo-readdrawpix.c | 13 +-
tests/fbo/fbo-readpixels-depth-formats.c | 13 +-
tests/fbo/fbo-readpixels.c | 13 +-
tests/fbo/fbo-rg.c | 13 +-
tests/fbo/fbo-scissor-bitmap.c | 14 +-
tests/fbo/fbo-scissor-blit.c | 9 +-
tests/fbo/fbo-srgb-blit.c | 13 +-
tests/fbo/fbo-srgb.c | 13 +-
tests/fbo/fbo-stencil.c | 13 +-
tests/fbo/fbo-storage-completeness.c | 14 +-
tests/fbo/fbo-storage-formats.c | 14 +-
tests/fbo/fbo-sys-blit.c | 13 +-
tests/fbo/fbo-sys-sub-blit.c | 13 +-
tests/fbo/fbo-viewport.c | 14 +-
tests/general/CMakeLists.gl.txt | 4 +-
tests/general/array-stride.c | 14 +-
tests/general/bgra-sec-color-pointer.c | 13 +-
tests/general/bgra-vert-attrib-pointer.c | 13 +-
tests/general/blendminmax.c | 13 +-
tests/general/blendsquare.c | 13 +-
tests/general/clear-accum.c | 13 +-
tests/general/clear-varray-2.0.c | 13 +-
tests/general/copy-pixels.c | 14 +-
tests/general/copypixels-draw-sync.c | 14 +-
tests/general/copypixels-sync.c | 14 +-
tests/general/depth-clamp-range.c | 13 +-
tests/general/depth_clamp.c | 13 +-
tests/general/depthfunc.c | 14 +-
tests/general/depthrange-clear.c | 13 +-
tests/general/dlist-clear.c | 13 +-
tests/general/dlist-color-material.c | 13 +-
tests/general/dlist-fdo3129-01.c | 14 +-
tests/general/dlist-fdo3129-02.c | 14 +-
tests/general/dlist-fdo31590.c | 14 +-
tests/general/draw-arrays-colormaterial.c | 13 +-
tests/general/draw-batch.c | 13 +-
tests/general/draw-copypixels-sync.c | 14 +-
tests/general/draw-elements-base-vertex-bounds.c | 13 +-
tests/general/draw-elements-base-vertex-neg.c | 13 +-
tests/general/draw-elements-base-vertex.c | 13 +-
tests/general/draw-elements-vs-inputs.c | 13 +-
tests/general/draw-elements.c | 13 +-
tests/general/draw-instanced-divisor.c | 13 +-
tests/general/draw-instanced.c | 13 +-
tests/general/draw-pixel-with-texture.c | 13 +-
tests/general/draw-pixels.c | 13 +-
tests/general/draw-sync.c | 14 +-
tests/general/draw-vertices-half-float.c | 13 +-
tests/general/draw-vertices.c | 13 +-
tests/general/drawpix-z.c | 12 +-
tests/general/early-z.c | 13 +-
tests/general/fog-modes.c | 14 +-
tests/general/fragment-center.c | 13 +-
tests/general/framebuffer-srgb.c | 13 +-
tests/general/getactiveattrib.c | 13 +-
tests/general/geterror-inside-begin.c | 13 +-
tests/general/geterror-invalid-enum.c | 13 +-
tests/general/gl30basic.c | 14 +-
tests/general/hiz.c | 14 +-
tests/general/infinite-spot-light.c | 13 +-
tests/general/isbufferobj.c | 14 +-
tests/general/line-aa-width.c | 13 +-
tests/general/linestipple.c | 13 +-
tests/general/longprim.c | 14 +-
tests/general/object_purgeable-api-pbo.c | 13 +-
tests/general/object_purgeable-api-texture.c | 13 +-
tests/general/object_purgeable-api-vbo.c | 13 +-
tests/general/occlusion-query-discard.c | 13 +-
tests/general/occlusion_query.c | 13 +-
tests/general/oes-read-format.c | 13 +-
tests/general/pbo-drawpixels.c | 13 +-
tests/general/pbo-read-argb8888.c | 13 +-
tests/general/pbo-readpixels-small.c | 13 +-
tests/general/pbo-teximage-tiling-2.c | 13 +-
tests/general/pbo-teximage-tiling.c | 13 +-
tests/general/pbo-teximage.c | 13 +-
tests/general/point-line-no-cull.c | 13 +-
tests/general/polygon-mode.c | 13 +-
tests/general/pos-array.c | 13 +-
tests/general/primitive-restart.c | 13 +-
tests/general/provoking-vertex.c | 13 +-
tests/general/quad-invariance.c | 13 +-
tests/general/read-front.c | 15 +-
tests/general/readpix-z.c | 12 +-
tests/general/roundmode-getintegerv.c | 14 +-
tests/general/roundmode-pixelstore.c | 14 +-
tests/general/scissor-bitmap.c | 14 +-
tests/general/scissor-clear.c | 13 +-
tests/general/scissor-copypixels.c | 13 +-
tests/general/scissor-depth-clear.c | 13 +-
tests/general/scissor-many.c | 13 +-
tests/general/scissor-offscreen.c | 13 +-
tests/general/scissor-stencil-clear.c | 13 +-
tests/general/select.c | 14 +-
tests/general/stencil-drawpixels.c | 13 +-
tests/general/stencil-twoside.c | 13 +-
tests/general/stencil-wrap.c | 13 +-
tests/general/sync_api.c | 13 +-
tests/general/texgen.c | 17 +-
tests/general/texunits.c | 13 +-
tests/general/timer_query.c | 13 +-
tests/general/triangle-rasterization-overdraw.cpp | 13 +-
tests/general/triangle-rasterization.cpp | 13 +-
.../general/two-sided-lighting-separate-specular.c | 13 +-
tests/general/two-sided-lighting.c | 13 +-
tests/general/user-clip.c | 14 +-
tests/general/vao-01.c | 13 +-
tests/general/vao-02.c | 13 +-
tests/general/vao-element-array-buffer.c | 13 +-
tests/general/varray-disabled.c | 13 +-
tests/general/vbo-bufferdata.c | 13 +-
tests/general/vbo-map-remap.c | 13 +-
tests/general/vbo-subdata-sync.c | 13 +-
tests/general/vbo-subdata-zero.c | 13 +-
tests/general/vs-point_size-zero.c | 13 +-
tests/general/windowoverlap.c | 2 +-
tests/gles2/gles2_shader_runner.c | 14 +-
tests/glslparsertest/glslparsertest.c | 22 +-
tests/glx/CMakeLists.gl.txt | 8 +-
tests/hiz/hiz-depth-read-fbo-d24-s0.c | 13 +-
tests/hiz/hiz-depth-read-fbo-d24-s8.c | 13 +-
tests/hiz/hiz-depth-read-fbo-d24s8.c | 13 +-
tests/hiz/hiz-depth-read-window-stencil0.c | 13 +-
tests/hiz/hiz-depth-read-window-stencil1.c | 13 +-
tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c | 13 +-
tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c | 13 +-
tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c | 13 +-
tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c | 13 +-
tests/hiz/hiz-depth-test-fbo-d24-s0.c | 13 +-
tests/hiz/hiz-depth-test-fbo-d24-s8.c | 13 +-
tests/hiz/hiz-depth-test-fbo-d24s8.c | 13 +-
tests/hiz/hiz-depth-test-window-stencil0.c | 13 +-
tests/hiz/hiz-depth-test-window-stencil1.c | 13 +-
tests/hiz/hiz-stencil-read-fbo-d0-s8.c | 13 +-
tests/hiz/hiz-stencil-read-fbo-d24-s8.c | 13 +-
tests/hiz/hiz-stencil-read-fbo-d24s8.c | 13 +-
tests/hiz/hiz-stencil-read-window-depth0.c | 13 +-
tests/hiz/hiz-stencil-read-window-depth1.c | 13 +-
tests/hiz/hiz-stencil-test-fbo-d0-s8.c | 13 +-
tests/hiz/hiz-stencil-test-fbo-d24-s8.c | 13 +-
tests/hiz/hiz-stencil-test-fbo-d24s8.c | 13 +-
tests/hiz/hiz-stencil-test-window-depth0.c | 13 +-
tests/hiz/hiz-stencil-test-window-depth1.c | 13 +-
tests/mesa/tests/texline.c | 91 ++---
tests/security/initialized-fbo.c | 13 +-
tests/security/initialized-texmemory.c | 13 +-
tests/security/initialized-vbo.c | 13 +-
tests/shaders/activeprogram-bad-program.c | 13 +-
tests/shaders/activeprogram-get.c | 13 +-
tests/shaders/ati-fs-bad-delete.c | 13 +-
tests/shaders/attribute0.c | 13 +-
.../shaders/createshaderprogram-attached-shaders.c | 13 +-
tests/shaders/createshaderprogram-bad-type.c | 13 +-
tests/shaders/fp-abs-01.c | 14 +-
tests/shaders/fp-abs-02.c | 14 +-
tests/shaders/fp-condition_codes-01.c | 14 +-
tests/shaders/fp-fog.c | 13 +-
tests/shaders/fp-formats.c | 14 +-
tests/shaders/fp-fragment-position.c | 13 +-
tests/shaders/fp-incomplete-tex.c | 13 +-
tests/shaders/fp-indirections.c | 13 +-
tests/shaders/fp-indirections2.c | 14 +-
tests/shaders/fp-kil.c | 13 +-
tests/shaders/fp-lit-mask.c | 13 +-
tests/shaders/fp-lit-src-equals-dst.c | 13 +-
tests/shaders/fp-long-alu.c | 14 +-
tests/shaders/fp-rfl.c | 14 +-
tests/shaders/fp-set-01.c | 14 +-
tests/shaders/fp-set-02.c | 14 +-
tests/shaders/fp-unpack-01.c | 14 +-
tests/shaders/getuniform-01.c | 14 +-
tests/shaders/getuniform-02.c | 14 +-
.../glsl-arb-fragment-coord-conventions-define.c | 13 +-
.../shaders/glsl-arb-fragment-coord-conventions.c | 15 +-
tests/shaders/glsl-bindattriblocation.c | 14 +-
tests/shaders/glsl-bug-22603.c | 13 +-
tests/shaders/glsl-cos.c | 13 +-
tests/shaders/glsl-deriv-varyings.c | 13 +-
tests/shaders/glsl-derivs.c | 13 +-
tests/shaders/glsl-dlist-getattriblocation.c | 14 +-
tests/shaders/glsl-empty-vs-no-fs.c | 13 +-
tests/shaders/glsl-explicit-location-01.c | 13 +-
tests/shaders/glsl-explicit-location-02.c | 13 +-
tests/shaders/glsl-explicit-location-03.c | 13 +-
tests/shaders/glsl-explicit-location-04.c | 13 +-
tests/shaders/glsl-explicit-location-05.c | 13 +-
tests/shaders/glsl-fs-bug25902.c | 13 +-
tests/shaders/glsl-fs-color-matrix.c | 13 +-
tests/shaders/glsl-fs-discard-02.c | 13 +-
tests/shaders/glsl-fs-exp2.c | 13 +-
tests/shaders/glsl-fs-flat-color.c | 13 +-
tests/shaders/glsl-fs-fogcolor-statechange.c | 13 +-
tests/shaders/glsl-fs-fragcoord-zw-ortho.c | 13 +-
tests/shaders/glsl-fs-fragcoord-zw-perspective.c | 13 +-
tests/shaders/glsl-fs-fragcoord.c | 13 +-
tests/shaders/glsl-fs-loop-nested.c | 13 +-
tests/shaders/glsl-fs-loop.c | 13 +-
tests/shaders/glsl-fs-mix-constant.c | 13 +-
tests/shaders/glsl-fs-mix.c | 13 +-
tests/shaders/glsl-fs-pointcoord.c | 13 +-
tests/shaders/glsl-fs-raytrace-bug27060.c | 13 +-
tests/shaders/glsl-fs-sampler-numbering.c | 13 +-
tests/shaders/glsl-fs-shader-stencil-export.c | 13 +-
tests/shaders/glsl-fs-sqrt-branch.c | 13 +-
tests/shaders/glsl-fs-texture2drect.c | 13 +-
tests/shaders/glsl-fs-texturecube-2.c | 13 +-
tests/shaders/glsl-fs-texturecube.c | 13 +-
.../shaders/glsl-fs-textureenvcolor-statechange.c | 13 +-
tests/shaders/glsl-fs-user-varying-ff.c | 13 +-
tests/shaders/glsl-fwidth.c | 13 +-
tests/shaders/glsl-getactiveuniform-array-size.c | 13 +-
tests/shaders/glsl-getactiveuniform-count.c | 13 +-
tests/shaders/glsl-getactiveuniform-length.c | 13 +-
tests/shaders/glsl-getattriblocation.c | 14 +-
tests/shaders/glsl-invalid-asm-01.c | 13 +-
tests/shaders/glsl-invalid-asm-02.c | 13 +-
tests/shaders/glsl-kwin-blur-1.c | 13 +-
tests/shaders/glsl-kwin-blur-2.c | 13 +-
tests/shaders/glsl-light-model.c | 13 +-
tests/shaders/glsl-link-bug30552.c | 13 +-
tests/shaders/glsl-link-bug38015.c | 13 +-
tests/shaders/glsl-link-empty-prog-01.c | 13 +-
tests/shaders/glsl-link-empty-prog-02.c | 13 +-
tests/shaders/glsl-link-initializer-03.c | 13 +-
tests/shaders/glsl-link-test.c | 13 +-
tests/shaders/glsl-lod-bias.c | 13 +-
tests/shaders/glsl-mat-attribute.c | 13 +-
tests/shaders/glsl-max-varyings.c | 13 +-
tests/shaders/glsl-max-vertex-attrib.c | 14 +-
tests/shaders/glsl-novertexdata.c | 14 +-
tests/shaders/glsl-orangebook-ch06-bump.c | 13 +-
tests/shaders/glsl-preprocessor-comments.c | 13 +-
tests/shaders/glsl-reload-source.c | 14 +-
tests/shaders/glsl-routing.c | 13 +-
tests/shaders/glsl-sin.c | 13 +-
tests/shaders/glsl-uniform-out-of-bounds.c | 14 +-
tests/shaders/glsl-uniform-update.c | 14 +-
tests/shaders/glsl-unused-varying.c | 13 +-
tests/shaders/glsl-useprogram-displaylist.c | 13 +-
tests/shaders/glsl-vs-arrays.c | 13 +-
tests/shaders/glsl-vs-functions.c | 13 +-
tests/shaders/glsl-vs-if-bool.c | 13 +-
tests/shaders/glsl-vs-loop-nested.c | 13 +-
tests/shaders/glsl-vs-loop.c | 13 +-
tests/shaders/glsl-vs-mov-after-deref.c | 13 +-
tests/shaders/glsl-vs-mvp-statechange.c | 13 +-
tests/shaders/glsl-vs-normalscale.c | 13 +-
tests/shaders/glsl-vs-point-size.c | 13 +-
tests/shaders/glsl-vs-raytrace-bug26691.c | 13 +-
tests/shaders/glsl-vs-statechange-1.c | 13 +-
tests/shaders/glsl-vs-texturematrix-1.c | 13 +-
tests/shaders/glsl-vs-texturematrix-2.c | 13 +-
tests/shaders/glsl-vs-user-varying-ff.c | 13 +-
tests/shaders/gpu_shader4_attribs.c | 13 +-
tests/shaders/link-mismatch-layout-01.c | 13 +-
tests/shaders/link-mismatch-layout-02.c | 13 +-
tests/shaders/link-mismatch-layout-03.c | 13 +-
tests/shaders/link-unresolved-function.c | 13 +-
tests/shaders/shader_runner.c | 13 +-
tests/shaders/sso-simple.c | 13 +-
tests/shaders/sso-uniforms-01.c | 13 +-
tests/shaders/sso-uniforms-02.c | 13 +-
tests/shaders/sso-user-varying-01.c | 13 +-
tests/shaders/sso-user-varying-02.c | 13 +-
tests/shaders/trinity-fp1.c | 13 +-
tests/shaders/useprogram-flushverts-1.c | 13 +-
tests/shaders/useprogram-flushverts-2.c | 13 +-
tests/shaders/useprogram-inside-begin.c | 13 +-
tests/shaders/useprogram-refcount-1.c | 13 +-
tests/shaders/useshaderprogram-bad-program.c | 13 +-
tests/shaders/useshaderprogram-bad-type.c | 13 +-
tests/shaders/useshaderprogram-flushverts-1.c | 13 +-
tests/shaders/vp-address-01.c | 14 +-
tests/shaders/vp-address-02.c | 14 +-
tests/shaders/vp-address-03.c | 14 +-
tests/shaders/vp-address-04.c | 14 +-
tests/shaders/vp-address-05.c | 14 +-
tests/shaders/vp-address-06.c | 14 +-
tests/shaders/vp-bad-program.c | 13 +-
tests/shaders/vp-clipdistance-01.c | 14 +-
tests/shaders/vp-clipdistance-02.c | 14 +-
tests/shaders/vp-clipdistance-03.c | 14 +-
tests/shaders/vp-clipdistance-04.c | 14 +-
tests/shaders/vp-combined-image-units.c | 13 +-
tests/shaders/vp-ignore-input.c | 13 +-
tests/shaders/vp-max-array.c | 14 +-
tests/shaders/vpfp-generic.cpp | 12 +-
.../amd_seamless_cubemap_per_texture.c | 13 +-
.../api/bindfragdataindexed-invalid-parameters.c | 13 +-
tests/spec/arb_blend_func_extended/api/blend-api.c | 13 +-
.../arb_blend_func_extended/api/error-at-begin.c | 13 +-
.../arb_blend_func_extended/api/getfragdataindex.c | 13 +-
.../execution/fbo-extended-blend-explicit.c | 14 +-
.../execution/fbo-extended-blend.c | 14 +-
tests/spec/arb_color_buffer_float/common.h | 12 +-
tests/spec/arb_copy_buffer/copy_buffer_coherency.c | 13 +-
tests/spec/arb_copy_buffer/copybuffersubdata.c | 13 +-
tests/spec/arb_copy_buffer/dlist.c | 13 +-
tests/spec/arb_copy_buffer/get.c | 13 +-
tests/spec/arb_copy_buffer/negative-bound-zero.c | 13 +-
tests/spec/arb_copy_buffer/negative-bounds.c | 13 +-
tests/spec/arb_copy_buffer/negative-mapped.c | 13 +-
tests/spec/arb_copy_buffer/overlap.c | 13 +-
tests/spec/arb_copy_buffer/targets.c | 13 +-
tests/spec/arb_debug_output/api_error.c | 13 +-
tests/spec/arb_draw_buffers/state_change.c | 13 +-
.../dlist-arb_draw_instanced.c | 13 +-
.../draw-elements-instanced-base-vertex.c | 13 +-
tests/spec/arb_draw_instanced/execution/dlist.c | 13 +-
tests/spec/arb_draw_instanced/execution/elements.c | 13 +-
.../execution/negative-arrays-first-negative.c | 13 +-
.../execution/negative-elements-type.c | 13 +-
.../arb_es2_compatibility-depthrangef.c | 13 +-
.../arb_es2_compatibility-drawbuffers.c | 13 +-
.../arb_es2_compatibility-fixed-type.c | 13 +-
...rb_es2_compatibility-getshaderprecisionformat.c | 13 +-
.../arb_es2_compatibility-maxvectors.c | 13 +-
.../arb_es2_compatibility-releaseshadercompiler.c | 13 +-
.../arb_es2_compatibility-shadercompiler.c | 13 +-
.../fbo-missing-attachment-blit.c | 13 +-
.../fbo-missing-attachment-clear.c | 13 +-
tests/spec/arb_fragment_program/minmax.c | 13 +-
.../framebuffer-blit-levels.c | 13 +-
.../get-renderbuffer-internalformat.c | 13 +-
...ufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c | 13 +-
...mebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c | 13 +-
tests/spec/arb_framebuffer_srgb/pushpop.c | 13 +-
tests/spec/arb_instanced_arrays/instanced_arrays.c | 13 +-
.../map_buffer_range_error_check.c | 13 +-
.../arb_map_buffer_range/map_buffer_range_test.c | 13 +-
tests/spec/arb_multisample/beginend.c | 13 +-
tests/spec/arb_multisample/pushpop.c | 13 +-
tests/spec/arb_robustness/client-mem-bounds.c | 13 +-
tests/spec/arb_robustness/draw-vbo-bounds.c | 13 +-
tests/spec/arb_sampler_objects/framebufferblit.c | 13 +-
.../spec/arb_sampler_objects/sampler-incomplete.c | 14 +-
tests/spec/arb_sampler_objects/sampler-objects.c | 14 +-
tests/spec/arb_sampler_objects/srgb-decode.c | 13 +-
.../arb_seamless_cube_map/arb_seamless_cubemap.c | 13 +-
.../bindattriblocation-scratch-name.c | 14 +-
tests/spec/arb_shader_objects/clear-with-deleted.c | 13 +-
tests/spec/arb_shader_objects/delete-repeat.c | 13 +-
.../arb_shader_objects/getactiveuniform-beginend.c | 13 +-
tests/spec/arb_shader_objects/getuniform.c | 13 +-
.../getuniformlocation-array-of-struct-of-array.c | 13 +-
.../arb_shader_texture_lod/execution/texgrad.c | 13 +-
tests/spec/arb_sync/repeat-wait.c | 13 +-
tests/spec/arb_sync/timeout-zero.c | 13 +-
tests/spec/arb_texture_buffer_object/dlist.c | 13 +-
tests/spec/arb_texture_buffer_object/formats.c | 13 +-
tests/spec/arb_texture_buffer_object/get.c | 13 +-
tests/spec/arb_texture_buffer_object/minmax.c | 13 +-
.../arb_texture_buffer_object/negative-bad-bo.c | 13 +-
.../negative-bad-format.c | 13 +-
.../negative-bad-target.c | 13 +-
tests/spec/arb_texture_buffer_object/unused-name.c | 13 +-
.../internal-format-query.c | 13 +-
.../spec/arb_texture_compression/invalid-formats.c | 13 +-
.../spec/arb_texture_float/texture-float-formats.c | 13 +-
tests/spec/arb_texture_storage/texture-storage.c | 13 +-
tests/spec/arb_timer_query/timestamp-get.c | 13 +-
tests/spec/arb_transform_feedback2/draw-auto.c | 13 +-
.../bindbuffer-general-point.c | 13 +-
.../arb_uniform_buffer_object/buffer-targets.c | 13 +-
.../spec/arb_uniform_buffer_object/deletebuffers.c | 13 +-
tests/spec/arb_uniform_buffer_object/dlist.c | 13 +-
...tactiveuniformblockiv-uniform-block-data-size.c | 13 +-
.../getactiveuniformblockname.c | 13 +-
.../getactiveuniformname.c | 13 +-
.../getactiveuniformsiv-uniform-array-stride.c | 13 +-
.../getactiveuniformsiv-uniform-block-index.c | 13 +-
.../getactiveuniformsiv-uniform-matrix-stride.c | 13 +-
.../getactiveuniformsiv-uniform-type.c | 13 +-
.../spec/arb_uniform_buffer_object/getintegeri_v.c | 13 +-
.../spec/arb_uniform_buffer_object/getprogramiv.c | 13 +-
.../getuniformblockindex.c | 13 +-
.../arb_uniform_buffer_object/getuniformindices.c | 13 +-
.../arb_uniform_buffer_object/getuniformlocation.c | 13 +-
.../layout-std140-base-size-and-alignment.c | 13 +-
.../spec/arb_uniform_buffer_object/layout-std140.c | 13 +-
.../link-mismatch-blocks.c | 13 +-
tests/spec/arb_uniform_buffer_object/maxblocks.c | 13 +-
tests/spec/arb_uniform_buffer_object/minmax.c | 13 +-
.../negative-bindbuffer-buffer.c | 13 +-
.../negative-bindbuffer-index.c | 13 +-
.../negative-bindbuffer-target.c | 13 +-
.../negative-bindbufferrange-range.c | 13 +-
.../negative-getactiveuniformblockiv.c | 13 +-
.../negative-getactiveuniformsiv.c | 13 +-
.../referenced-by-shader.c | 13 +-
tests/spec/arb_uniform_buffer_object/row-major.c | 13 +-
.../uniformblockbinding.c | 13 +-
.../elements-negative-offset.c | 13 +-
.../mixed-immediate-and-vbo.c | 13 +-
.../spec/arb_vertex_program/getenv4d-with-error.c | 13 +-
.../arb_vertex_program/getlocal4d-with-error.c | 13 +-
tests/spec/arb_vertex_program/minmax.c | 13 +-
.../draw-vertices-2101010.c | 13 +-
tests/spec/ati_draw_buffers/arbfp-no-index.c | 13 +-
tests/spec/ati_draw_buffers/arbfp-no-option.c | 13 +-
tests/spec/ati_draw_buffers/arbfp.c | 13 +-
tests/spec/ati_envmap_bumpmap/bump.c | 14 +-
tests/spec/ext_fog_coord/modes.c | 14 +-
.../spec/ext_framebuffer_multisample/accuracy.cpp | 13 +-
.../ext_framebuffer_multisample/alpha-blending.c | 13 +-
.../alpha-to-coverage-dual-src-blend.cpp | 12 +-
.../alpha-to-coverage-no-draw-buffer-zero.cpp | 12 +-
.../alpha-to-one-dual-src-blend.cpp | 12 +-
.../alpha-to-one-msaa-disabled.cpp | 12 +-
.../alpha-to-one-single-sample-buffer.cpp | 12 +-
tests/spec/ext_framebuffer_multisample/bitmap.cpp | 12 +-
.../ext_framebuffer_multisample/blit-flipped.cpp | 12 +-
.../blit-mismatched-formats.cpp | 12 +-
.../blit-mismatched-samples.cpp | 12 +-
.../blit-mismatched-sizes.cpp | 12 +-
tests/spec/ext_framebuffer_multisample/clear.cpp | 13 +-
.../clip-and-scissor-blit.cpp | 13 +-
tests/spec/ext_framebuffer_multisample/dlist.c | 13 +-
.../draw-buffers-alpha-to-coverage.cpp | 12 +-
.../draw-buffers-alpha-to-one.cpp | 12 +-
.../ext_framebuffer_multisample/enable-flag.cpp | 12 +-
tests/spec/ext_framebuffer_multisample/formats.cpp | 13 +-
.../int-draw-buffers-alpha-to-coverage.cpp | 12 +-
.../int-draw-buffers-alpha-to-one.cpp | 12 +-
.../ext_framebuffer_multisample/interpolation.cpp | 13 +-
.../ext_framebuffer_multisample/line-smooth.cpp | 12 +-
tests/spec/ext_framebuffer_multisample/minmax.c | 13 +-
.../multisample-blit.cpp | 12 +-
.../negative-copypixels.c | 13 +-
.../negative-copyteximage.c | 13 +-
.../negative-max-samples.c | 13 +-
.../negative-mismatched-samples.c | 13 +-
.../negative-readpixels.c | 13 +-
.../spec/ext_framebuffer_multisample/no-color.cpp | 13 +-
.../ext_framebuffer_multisample/point-smooth.cpp | 12 +-
.../ext_framebuffer_multisample/polygon-smooth.cpp | 12 +-
.../polygon-stipple.cpp | 12 +-
.../renderbuffer-samples.c | 13 +-
.../renderbufferstorage-samples.c | 13 +-
.../sample-alpha-to-coverage.cpp | 12 +-
.../sample-alpha-to-one.cpp | 12 +-
.../sample-coverage.cpp | 12 +-
tests/spec/ext_framebuffer_multisample/samples.c | 13 +-
.../ext_framebuffer_multisample/turn-on-off.cpp | 13 +-
.../ext_framebuffer_multisample/unaligned-blit.cpp | 12 +-
.../spec/ext_framebuffer_multisample/upsample.cpp | 12 +-
.../ext_packed_depth_stencil/readpixels-24_8.c | 13 +-
.../getteximage-invalid-format-for-packed-type.c | 13 +-
tests/spec/ext_packed_float/pack.c | 13 +-
tests/spec/ext_texture_array/maxlayers.c | 13 +-
tests/spec/ext_texture_integer/api-drawpixels.c | 13 +-
tests/spec/ext_texture_integer/api-readpixels.c | 13 +-
tests/spec/ext_texture_integer/api-teximage.c | 13 +-
tests/spec/ext_texture_integer/fbo-blending.c | 13 +-
.../fbo-integer-precision-clear.c | 13 +-
.../fbo-integer-readpixels-sint-uint.c | 13 +-
.../ext_texture_integer/getteximage-clamping.c | 13 +-
.../ext_texture_integer/texture-integer-glsl130.c | 13 +-
tests/spec/ext_timer_query/time-elapsed.c | 13 +-
tests/spec/ext_transform_feedback/alignment.c | 13 +-
tests/spec/ext_transform_feedback/api-errors.c | 13 +-
tests/spec/ext_transform_feedback/buffer-usage.c | 13 +-
.../spec/ext_transform_feedback/builtin-varyings.c | 13 +-
tests/spec/ext_transform_feedback/discard-api.c | 13 +-
tests/spec/ext_transform_feedback/discard-bitmap.c | 13 +-
tests/spec/ext_transform_feedback/discard-clear.c | 13 +-
.../ext_transform_feedback/discard-copypixels.c | 13 +-
.../ext_transform_feedback/discard-drawarrays.c | 13 +-
.../ext_transform_feedback/discard-drawpixels.c | 13 +-
tests/spec/ext_transform_feedback/generatemipmap.c | 13 +-
.../spec/ext_transform_feedback/get-buffer-state.c | 13 +-
.../spec/ext_transform_feedback/immediate-reuse.c | 13 +-
tests/spec/ext_transform_feedback/interleaved.c | 13 +-
.../spec/ext_transform_feedback/intervening-read.c | 13 +-
tests/spec/ext_transform_feedback/max-varyings.c | 13 +-
tests/spec/ext_transform_feedback/negative-prims.c | 13 +-
tests/spec/ext_transform_feedback/order.c | 13 +-
tests/spec/ext_transform_feedback/output-type.c | 13 +-
.../ext_transform_feedback/overflow-edge-cases.c | 13 +-
tests/spec/ext_transform_feedback/position.c | 13 +-
tests/spec/ext_transform_feedback/separate.c | 13 +-
tests/spec/ext_transform_feedback/tessellation.c | 13 +-
.../spec/ext_unpack_subimage/ext_unpack_subimage.c | 13 +-
tests/spec/gl-1.0/edgeflag-quads.c | 13 +-
tests/spec/gl-1.0/edgeflag.c | 13 +-
tests/spec/gl-2.0/api/clip-flag-behavior.c | 13 +-
.../gl-2.0/api/getattriblocation-conventional.c | 13 +-
tests/spec/gl-2.0/edgeflag.c | 13 +-
tests/spec/gl-2.0/vertex-program-two-side.c | 13 +-
tests/spec/gl-2.1/minmax.c | 13 +-
.../gl-3.0/api/bindfragdata-invalid-parameters.c | 13 +-
tests/spec/gl-3.0/api/bindfragdata-link-error.c | 13 +-
.../gl-3.0/api/bindfragdata-nonexistent-variable.c | 13 +-
tests/spec/gl-3.0/api/clearbuffer-common.c | 13 +-
tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c | 13 +-
.../gl-3.0/api/clearbuffer-invalid-drawbuffer.c | 13 +-
tests/spec/gl-3.0/api/getfragdatalocation.c | 13 +-
tests/spec/gl-3.0/api/integer-errors.c | 12 +-
tests/spec/gl-3.0/minmax.c | 13 +-
.../required-renderbuffer-attachment-formats.c | 13 +-
tests/spec/gl-3.0/required-sized-texture-formats.c | 13 +-
.../gl-3.0/required-texture-attachment-formats.c | 13 +-
tests/spec/gl-3.0/texture-integer.c | 12 +-
tests/spec/gl-3.1/minmax.c | 14 +-
.../execution/clipping/clip-plane-transformation.c | 13 +-
.../execution/glsl-render-after-bad-attach.c | 13 +-
tests/spec/glsl-1.20/recursion/recursion.c | 13 +-
.../execution/clipping/max-clip-distances.c | 13 +-
tests/spec/glsl-1.30/execution/fs-discard-exit-2.c | 13 +-
.../glsl-1.30/execution/fs-execution-ordering.c | 13 +-
tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c | 13 +-
.../glsl-1.30/execution/fs-texelFetchOffset-2D.c | 13 +-
tests/spec/glsl-1.30/execution/isinf-and-isnan.c | 13 +-
tests/spec/glsl-1.30/execution/vertexid-beginend.c | 13 +-
.../spec/glsl-1.30/execution/vertexid-drawarrays.c | 13 +-
.../glsl-1.30/execution/vertexid-drawelements.c | 13 +-
...xing-clip-distance-and-clip-vertex-disallowed.c | 13 +-
tests/spec/glsl-1.30/texel-offset-limits.c | 13 +-
tests/spec/glsl-1.40/tf-no-position.c | 13 +-
.../spec/glx_arb_create_context/CMakeLists.gl.txt | 8 +-
.../spec/glx_ext_import_context/CMakeLists.gl.txt | 8 +-
.../nv_conditional_render/begin-while-active.c | 13 +-
tests/spec/nv_conditional_render/begin-zero.c | 13 +-
tests/spec/nv_conditional_render/bitmap.c | 13 +-
tests/spec/nv_conditional_render/blitframebuffer.c | 13 +-
tests/spec/nv_conditional_render/clear.c | 13 +-
tests/spec/nv_conditional_render/copypixels.c | 13 +-
tests/spec/nv_conditional_render/copyteximage.c | 13 +-
tests/spec/nv_conditional_render/copytexsubimage.c | 13 +-
tests/spec/nv_conditional_render/dlist.c | 13 +-
tests/spec/nv_conditional_render/drawpixels.c | 13 +-
tests/spec/nv_conditional_render/generatemipmap.c | 13 +-
tests/spec/nv_conditional_render/vertex_array.c | 13 +-
tests/spec/nv_texture_barrier/blending-in-shader.c | 13 +-
.../oes_compressed_etc1_rgb8_texture-basic.c | 13 +-
.../oes_compressed_etc1_rgb8_texture-miptree.c | 12 +-
.../oes_compressed_paletted_texture-api.c | 17 +-
tests/spec/oes_draw_texture/oes_draw_texture.c | 13 +-
tests/texturing/1-1-linear-texture.c | 13 +-
tests/texturing/CMakeLists.gl.txt | 10 +-
tests/texturing/array-depth-roundtrip.c | 13 +-
tests/texturing/array-texture.c | 13 +-
tests/texturing/compressedteximage.c | 13 +-
tests/texturing/copyteximage-border.c | 13 +-
tests/texturing/copyteximage-clipping.c | 13 +-
tests/texturing/copyteximage.c | 13 +-
tests/texturing/copytexsubimage.c | 13 +-
tests/texturing/crossbar.c | 13 +-
tests/texturing/cubemap.c | 13 +-
tests/texturing/depth-cube-map.c | 13 +-
tests/texturing/depth-level-clamp.c | 13 +-
tests/texturing/depth-tex-compare.c | 14 +-
tests/texturing/depth-tex-modes-glsl.c | 13 +-
tests/texturing/depth-tex-modes-rg.c | 14 +-
tests/texturing/depth-tex-modes.c | 14 +-
tests/texturing/depthstencil-render-miplevels.cpp | 13 +-
tests/texturing/fragment-and-vertex-texturing.c | 13 +-
tests/texturing/fxt1-teximage.c | 13 +-
tests/texturing/gen-compressed-teximage.c | 13 +-
tests/texturing/gen-nonzero-unit.c | 13 +-
tests/texturing/gen-teximage.c | 13 +-
tests/texturing/gen-texsubimage.c | 13 +-
tests/texturing/getteximage-formats.c | 78 +---
tests/texturing/getteximage-luminance.c | 13 +-
tests/texturing/getteximage-simple.c | 13 +-
tests/texturing/incomplete-texture.c | 13 +-
tests/texturing/levelclamp.c | 13 +-
tests/texturing/lodbias.c | 18 +-
tests/texturing/lodclamp-between-max.c | 13 +-
tests/texturing/lodclamp-between.c | 13 +-
tests/texturing/lodclamp.c | 13 +-
tests/texturing/max-texture-size-level.c | 9 +-
tests/texturing/max-texture-size.c | 13 +-
tests/texturing/mipmap-setup.c | 14 +-
tests/texturing/proxy-texture.c | 13 +-
tests/texturing/rg-draw-pixels.c | 14 +-
tests/texturing/rg-teximage-01.c | 14 +-
tests/texturing/rg-teximage-02.c | 14 +-
tests/texturing/rg-teximage-common.c | 1 -
tests/texturing/rgtc-teximage-01.c | 14 +-
tests/texturing/rgtc-teximage-02.c | 14 +-
tests/texturing/s3tc-teximage.c | 13 +-
tests/texturing/s3tc-texsubimage.c | 13 +-
tests/texturing/sampler-cube-shadow.c | 13 +-
tests/texturing/shaders/texelFetch.c | 13 +-
tests/texturing/shaders/textureSize.c | 13 +-
tests/texturing/sized-texture-format-channels.c | 13 +-
tests/texturing/streaming-texture-leak.c | 13 +-
tests/texturing/tex-border-1.c | 13 +-
tests/texturing/tex-miplevel-selection.c | 13 +-
tests/texturing/tex-skipped-unit.c | 14 +-
tests/texturing/tex-srgb.c | 13 +-
tests/texturing/tex-swizzle.c | 13 +-
tests/texturing/tex3d-depth1.c | 13 +-
tests/texturing/tex3d-maxsize.c | 13 +-
tests/texturing/tex3d-npot.c | 13 +-
tests/texturing/tex3d.c | 13 +-
tests/texturing/texdepth.c | 17 +-
tests/texturing/teximage-errors.c | 13 +-
tests/texturing/texrect-many.c | 13 +-
tests/texturing/texredefine.c | 13 +-
tests/texturing/texsubimage.c | 13 +-
tests/texturing/texture-al.c | 13 +-
tests/texturing/texture-packed-formats.c | 72 +---
tests/texturing/texture-rg.c | 13 +-
tests/texturing/texwrap.c | 23 +-
tests/util/CMakeLists.gl.txt | 9 +-
tests/util/CMakeLists.txt | 25 +-
tests/util/piglit-framework-fbo.c | 339 -----------------
tests/util/piglit-framework-fbo.h | 32 --
tests/util/piglit-framework-gl.c | 164 ++++++++
tests/util/piglit-framework-gl.h | 235 ++++++++++++
tests/util/piglit-framework-gl/README.txt | 34 ++
.../piglit-framework-gl/piglit_fbo_framework.c | 161 ++++++++
.../piglit-framework-gl/piglit_fbo_framework.h | 29 ++
.../util/piglit-framework-gl/piglit_gl_framework.c | 112 ++++++
.../util/piglit-framework-gl/piglit_gl_framework.h | 82 ++++
.../piglit-framework-gl/piglit_glut_framework.c | 182 +++++++++
.../piglit-framework-gl/piglit_glut_framework.h | 29 ++
.../piglit-framework-gl/piglit_wfl_framework.c | 421 +++++++++++++++++++++
.../piglit-framework-gl/piglit_wfl_framework.h | 67 ++++
.../piglit-framework-gl/piglit_winsys_framework.c | 179 +++++++++
.../piglit-framework-gl/piglit_winsys_framework.h | 83 ++++
.../util/piglit-framework-gl/piglit_wl_framework.c | 95 +++++
.../util/piglit-framework-gl/piglit_wl_framework.h | 29 ++
.../piglit-framework-gl/piglit_x11_framework.c | 222 +++++++++++
.../piglit-framework-gl/piglit_x11_framework.h | 36 ++
tests/util/piglit-framework-glut.c | 149 --------
tests/util/piglit-framework-glut.h | 33 --
tests/util/piglit-framework.c | 142 -------
tests/util/piglit-framework.h | 133 -------
tests/util/piglit-shader-gl.c | 4 +-
tests/util/piglit-shader-gles1.c | 4 +-
tests/util/piglit-shader-gles2.c | 4 +-
tests/util/piglit-shader.c | 2 +-
tests/util/piglit-shader.h | 4 +-
tests/util/piglit-util-gl-common.h | 2 +-
tests/util/piglit-util-gl-enum.c | 8 +-
tests/util/piglit-util-gl.c | 2 +-
tests/util/piglit-util-gles.c | 8 +-
tests/util/piglit-util-waffle.c | 89 +++++
tests/util/piglit-util-waffle.h | 119 ++++++
tests/util/piglit-util.c | 26 ++
tests/util/piglit-util.h | 15 +
tests/util/piglit_ktx.c | 6 +-
749 files changed, 8748 insertions(+), 4625 deletions(-)
delete mode 100644 src/glut_waffle/CMakeLists.no_api.txt
delete mode 100644 src/glut_waffle/CMakeLists.txt
delete mode 100644 src/glut_waffle/README.txt
delete mode 100644 src/glut_waffle/TODO.txt
delete mode 100644 src/glut_waffle/glut_waffle.c
delete mode 100644 src/glut_waffle/glut_waffle.h
delete mode 100644 src/glut_waffle/priv/common.c
delete mode 100644 src/glut_waffle/priv/common.h
delete mode 100644 src/glut_waffle/priv/x11.c
delete mode 100644 src/glut_waffle/priv/x11.h
delete mode 100644 tests/util/piglit-framework-fbo.c
delete mode 100644 tests/util/piglit-framework-fbo.h
create mode 100644 tests/util/piglit-framework-gl.c
create mode 100644 tests/util/piglit-framework-gl.h
create mode 100644 tests/util/piglit-framework-gl/README.txt
create mode 100644 tests/util/piglit-framework-gl/piglit_fbo_framework.c
create mode 100644 tests/util/piglit-framework-gl/piglit_fbo_framework.h
create mode 100644 tests/util/piglit-framework-gl/piglit_gl_framework.c
create mode 100644 tests/util/piglit-framework-gl/piglit_gl_framework.h
create mode 100644 tests/util/piglit-framework-gl/piglit_glut_framework.c
create mode 100644 tests/util/piglit-framework-gl/piglit_glut_framework.h
create mode 100644 tests/util/piglit-framework-gl/piglit_wfl_framework.c
create mode 100644 tests/util/piglit-framework-gl/piglit_wfl_framework.h
create mode 100644 tests/util/piglit-framework-gl/piglit_winsys_framework.c
create mode 100644 tests/util/piglit-framework-gl/piglit_winsys_framework.h
create mode 100644 tests/util/piglit-framework-gl/piglit_wl_framework.c
create mode 100644 tests/util/piglit-framework-gl/piglit_wl_framework.h
create mode 100644 tests/util/piglit-framework-gl/piglit_x11_framework.c
create mode 100644 tests/util/piglit-framework-gl/piglit_x11_framework.h
delete mode 100644 tests/util/piglit-framework-glut.c
delete mode 100644 tests/util/piglit-framework-glut.h
delete mode 100644 tests/util/piglit-framework.c
delete mode 100644 tests/util/piglit-framework.h
create mode 100644 tests/util/piglit-util-waffle.c
create mode 100644 tests/util/piglit-util-waffle.h
--
1.7.12.1
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
