The goal that this series achieves is to replace the main() function in piglit-framework.c with a new function, piglit_gl_test_run(), that takes as its input a data structure describing the test initialization info. This goal is a stepping stone towards a larger set of goals discussed earlier this month [1]. In the future, the piglit_gl_test_info struct will also contain a declarative desciption of each test's requirements on GL context flavor, extensions, and window systems.
There is another reason, in addition to those discussed in [1], for why main() should be moved out of libpiglitutil. The EGL tests, GLX tests, and glean all define main(), yet also link to libpiglitutil. Surprisingly, the linker doesn't complain. However, the situation is fragile. If you modify the libraries or tests in a way that changes the order in which the linker resolves things, link failure occurs. The proper solution is not to tiptoe around the linker; it's to remove main() from the library. If you want to skip to the important stuff, see patches 11-14. All the other patches are just prerequisite cleanups that prepare for those last 4. This series taks a few detours, cleans out the closet, and reorganizes your kitchen junk drawer. Often, you must clean up the house before remodeling it. I feel that all the little detours were needed and that Piglit really benefits from them. I wanted to clean up a lot more, but I restrained myself only to the cleanups that directly benefited the series' stated goal. No regresssions found on Sandybridge. [1] See points 5 and 6 in in http://www.mail-archive.com/piglit@lists.freedesktop.org/msg00239.html. Chad Versace (14): msvc: Copy c99 headers from Mesa for MSVC cmake: For MSVC, add "include/msvc/c99" to include path util: Remove custom defs of C99 types for MSVC util: Add missing #include util: Move piglit_use_fbo to piglit-framework.* util: Remove unused piglit_present_results() util: Move glut code from piglit-framework.* to piglit-framework-glut.* util: Refactor argv processing out of main() util: Move more GLUT initializtion code into piglit-framework-glut.c util: Refactor testrunner logic for fbo and glut tests out of main() util: Define PIGLIT_GL_TEST_MAIN() and friends tests: Let each test define main() util: Remove unused piglit-framework.c:main() util: Remove and refactor weak global symbols in libpiglitutil CMakeLists.txt | 2 + include/msvc/c99/inttypes.h | 305 ++++++++++++++++++++ include/msvc/c99/stdbool.h | 46 +++ include/msvc/c99/stdint.h | 247 ++++++++++++++++ tests/asmparsertest/asmparsertest.c | 6 +- tests/bugs/crash-cubemap-order.c | 6 +- tests/bugs/crash-texparameter-before-teximage.c | 7 +- tests/bugs/drawbuffer-modes.c | 7 +- tests/bugs/fdo10370.c | 7 +- tests/bugs/fdo14575.c | 6 +- tests/bugs/fdo20701.c | 6 +- tests/bugs/fdo22540.c | 6 +- tests/bugs/fdo23489.c | 6 +- tests/bugs/fdo23670-depth_test.c | 7 +- tests/bugs/fdo23670-drawpix_stencil.c | 7 +- tests/bugs/fdo24066.c | 8 +- tests/bugs/fdo25614-genmipmap.c | 7 +- tests/bugs/fdo28551.c | 8 +- tests/bugs/fdo31934.c | 6 +- tests/bugs/fdo9833.c | 6 +- tests/bugs/point-sprite.c | 7 +- tests/bugs/r300-readcache.c | 6 +- tests/bugs/tex1d-2dborder.c | 6 +- tests/bugs/tri-tex-crash.c | 8 +- tests/bugs/vbo-buffer-unmap.c | 8 +- tests/fbo/fbo-1d.c | 8 +- tests/fbo/fbo-3d.c | 8 +- tests/fbo/fbo-alpha.c | 7 +- tests/fbo/fbo-alphatest-formats.c | 8 +- tests/fbo/fbo-alphatest-nocolor-ff.c | 8 +- tests/fbo/fbo-alphatest-nocolor.c | 9 +- tests/fbo/fbo-array.c | 8 +- tests/fbo/fbo-bind-renderbuffer.c | 7 +- tests/fbo/fbo-blending-formats.c | 8 +- tests/fbo/fbo-blit-d24s8.c | 8 +- tests/fbo/fbo-blit.c | 8 +- tests/fbo/fbo-clear-formats.c | 8 +- tests/fbo/fbo-clearmipmap.c | 7 +- tests/fbo/fbo-copypix.c | 8 +- tests/fbo/fbo-copyteximage-simple.c | 8 +- tests/fbo/fbo-copyteximage.c | 8 +- tests/fbo/fbo-cubemap.c | 8 +- tests/fbo/fbo-depth-array.c | 8 +- tests/fbo/fbo-depth-sample-compare.c | 8 +- tests/fbo/fbo-depth-tex1d.c | 8 +- tests/fbo/fbo-depth.c | 9 +- tests/fbo/fbo-depthstencil.c | 9 +- tests/fbo/fbo-depthtex.c | 7 +- tests/fbo/fbo-draw-buffers-blend.c | 7 +- tests/fbo/fbo-drawbuffers-arbfp.c | 7 +- tests/fbo/fbo-drawbuffers-blend-add.c | 7 +- tests/fbo/fbo-drawbuffers-fragcolor.c | 7 +- tests/fbo/fbo-drawbuffers-maxtargets.c | 7 +- tests/fbo/fbo-drawbuffers.c | 7 +- tests/fbo/fbo-drawbuffers2-blend.c | 7 +- tests/fbo/fbo-drawbuffers2-colormask.c | 7 +- tests/fbo/fbo-finish-deleted.c | 8 +- tests/fbo/fbo-flushing-2.c | 7 +- tests/fbo/fbo-flushing.c | 7 +- tests/fbo/fbo-fragcoord.c | 6 +- tests/fbo/fbo-fragcoord2.c | 7 +- tests/fbo/fbo-generatemipmap-array.c | 8 +- tests/fbo/fbo-generatemipmap-filtering.c | 8 +- tests/fbo/fbo-generatemipmap-formats.c | 7 +- tests/fbo/fbo-generatemipmap-noimage.c | 7 +- tests/fbo/fbo-generatemipmap-nonsquare.c | 8 +- tests/fbo/fbo-generatemipmap-npot.c | 8 +- tests/fbo/fbo-generatemipmap-scissor.c | 8 +- tests/fbo/fbo-generatemipmap-viewport.c | 8 +- tests/fbo/fbo-generatemipmap.c | 8 +- .../fbo/fbo-getframebufferattachmentparameter-01.c | 7 +- tests/fbo/fbo-gl_pointcoord.c | 6 +- tests/fbo/fbo-incomplete-texture-01.c | 7 +- tests/fbo/fbo-incomplete-texture-02.c | 7 +- tests/fbo/fbo-incomplete-texture-03.c | 7 +- tests/fbo/fbo-incomplete-texture-04.c | 7 +- tests/fbo/fbo-integer.c | 6 +- tests/fbo/fbo-luminance-alpha.c | 7 +- tests/fbo/fbo-maxsize.c | 9 +- tests/fbo/fbo-mipmap-copypix.c | 7 +- tests/fbo/fbo-nodepth-test.c | 7 +- tests/fbo/fbo-nostencil-test.c | 7 +- tests/fbo/fbo-pbo-readpixels-small.c | 8 +- tests/fbo/fbo-readdrawpix.c | 8 +- tests/fbo/fbo-readpixels-depth-formats.c | 8 +- tests/fbo/fbo-readpixels.c | 8 +- tests/fbo/fbo-rg.c | 7 +- tests/fbo/fbo-scissor-bitmap.c | 7 +- tests/fbo/fbo-srgb-blit.c | 7 +- tests/fbo/fbo-srgb.c | 6 +- tests/fbo/fbo-stencil.c | 9 +- tests/fbo/fbo-storage-completeness.c | 7 +- tests/fbo/fbo-storage-formats.c | 7 +- tests/fbo/fbo-sys-blit.c | 7 +- tests/fbo/fbo-sys-sub-blit.c | 7 +- tests/fbo/fbo-viewport.c | 8 +- tests/general/array-stride.c | 7 +- tests/general/bgra-sec-color-pointer.c | 6 +- tests/general/bgra-vert-attrib-pointer.c | 6 +- tests/general/blendminmax.c | 8 +- tests/general/blendsquare.c | 8 +- tests/general/clear-accum.c | 7 +- tests/general/clear-varray-2.0.c | 6 +- tests/general/copy-pixels.c | 8 +- tests/general/copypixels-draw-sync.c | 7 +- tests/general/copypixels-sync.c | 7 +- tests/general/depth-clamp-range.c | 6 +- tests/general/depth_clamp.c | 6 +- tests/general/depthfunc.c | 7 +- tests/general/depthrange-clear.c | 6 +- tests/general/dlist-clear.c | 6 +- tests/general/dlist-color-material.c | 9 +- tests/general/dlist-fdo3129-01.c | 7 +- tests/general/dlist-fdo3129-02.c | 7 +- tests/general/dlist-fdo31590.c | 7 +- tests/general/draw-arrays-colormaterial.c | 7 +- tests/general/draw-batch.c | 6 +- tests/general/draw-copypixels-sync.c | 7 +- tests/general/draw-elements-base-vertex-bounds.c | 6 +- tests/general/draw-elements-base-vertex-neg.c | 6 +- tests/general/draw-elements-base-vertex.c | 6 +- tests/general/draw-elements-vs-inputs.c | 8 +- tests/general/draw-elements.c | 6 +- tests/general/draw-instanced-divisor.c | 7 +- tests/general/draw-instanced.c | 7 +- tests/general/draw-pixel-with-texture.c | 6 +- tests/general/draw-pixels.c | 7 +- tests/general/draw-sync.c | 7 +- tests/general/draw-vertices-half-float.c | 6 +- tests/general/draw-vertices.c | 6 +- tests/general/early-z.c | 8 +- tests/general/fog-modes.c | 7 +- tests/general/fragment-center.c | 6 +- tests/general/framebuffer-srgb.c | 6 +- tests/general/getactiveattrib.c | 6 +- tests/general/geterror-inside-begin.c | 6 +- tests/general/geterror-invalid-enum.c | 6 +- tests/general/gl30basic.c | 7 +- tests/general/hiz.c | 7 +- tests/general/infinite-spot-light.c | 6 +- tests/general/isbufferobj.c | 7 +- tests/general/line-aa-width.c | 6 +- tests/general/linestipple.c | 6 +- tests/general/longprim.c | 7 +- tests/general/object_purgeable-api-pbo.c | 6 +- tests/general/object_purgeable-api-texture.c | 6 +- tests/general/object_purgeable-api-vbo.c | 6 +- tests/general/occlusion-query-discard.c | 6 +- tests/general/occlusion_query.c | 6 +- tests/general/oes-read-format.c | 6 +- tests/general/pbo-drawpixels.c | 6 +- tests/general/pbo-read-argb8888.c | 6 +- tests/general/pbo-readpixels-small.c | 6 +- tests/general/pbo-teximage-tiling-2.c | 6 +- tests/general/pbo-teximage-tiling.c | 6 +- tests/general/pbo-teximage.c | 6 +- tests/general/point-line-no-cull.c | 8 +- tests/general/polygon-mode.c | 7 +- tests/general/pos-array.c | 6 +- tests/general/primitive-restart.c | 6 +- tests/general/provoking-vertex.c | 6 +- tests/general/quad-invariance.c | 6 +- tests/general/read-front.c | 6 +- tests/general/roundmode-getintegerv.c | 7 +- tests/general/roundmode-pixelstore.c | 7 +- tests/general/scissor-bitmap.c | 7 +- tests/general/scissor-clear.c | 6 +- tests/general/scissor-copypixels.c | 6 +- tests/general/scissor-depth-clear.c | 6 +- tests/general/scissor-many.c | 6 +- tests/general/scissor-offscreen.c | 7 +- tests/general/scissor-stencil-clear.c | 6 +- tests/general/select.c | 7 +- tests/general/stencil-drawpixels.c | 6 +- tests/general/stencil-twoside.c | 9 +- tests/general/stencil-wrap.c | 7 +- tests/general/sync_api.c | 7 +- tests/general/texgen.c | 7 +- tests/general/texunits.c | 8 +- tests/general/timer_query.c | 6 +- tests/general/triangle-rasterization-overdraw.cpp | 8 +- tests/general/triangle-rasterization.cpp | 8 +- .../general/two-sided-lighting-separate-specular.c | 7 +- tests/general/two-sided-lighting.c | 7 +- tests/general/user-clip.c | 11 +- tests/general/vao-01.c | 7 +- tests/general/vao-02.c | 7 +- tests/general/vao-element-array-buffer.c | 7 +- tests/general/varray-disabled.c | 6 +- tests/general/vbo-bufferdata.c | 6 +- tests/general/vbo-map-remap.c | 6 +- tests/general/vbo-subdata-sync.c | 6 +- tests/general/vbo-subdata-zero.c | 6 +- tests/general/vs-point_size-zero.c | 7 +- tests/gles2/gles2_shader_runner.c | 6 +- tests/glslparsertest/glslparsertest.c | 6 +- tests/hiz/hiz-depth-read-fbo-d24-s0.c | 7 +- tests/hiz/hiz-depth-read-fbo-d24-s8.c | 7 +- tests/hiz/hiz-depth-read-fbo-d24s8.c | 7 +- tests/hiz/hiz-depth-read-window-stencil0.c | 7 +- tests/hiz/hiz-depth-read-window-stencil1.c | 7 +- tests/hiz/hiz-depth-stencil-test-fbo-d0-s8.c | 7 +- tests/hiz/hiz-depth-stencil-test-fbo-d24-s0.c | 7 +- tests/hiz/hiz-depth-stencil-test-fbo-d24-s8.c | 7 +- tests/hiz/hiz-depth-stencil-test-fbo-d24s8.c | 7 +- tests/hiz/hiz-depth-test-fbo-d24-s0.c | 7 +- tests/hiz/hiz-depth-test-fbo-d24-s8.c | 7 +- tests/hiz/hiz-depth-test-fbo-d24s8.c | 7 +- tests/hiz/hiz-depth-test-window-stencil0.c | 7 +- tests/hiz/hiz-depth-test-window-stencil1.c | 7 +- tests/hiz/hiz-stencil-read-fbo-d0-s8.c | 7 +- tests/hiz/hiz-stencil-read-fbo-d24-s8.c | 7 +- tests/hiz/hiz-stencil-read-fbo-d24s8.c | 7 +- tests/hiz/hiz-stencil-read-window-depth0.c | 7 +- tests/hiz/hiz-stencil-read-window-depth1.c | 7 +- tests/hiz/hiz-stencil-test-fbo-d0-s8.c | 7 +- tests/hiz/hiz-stencil-test-fbo-d24-s8.c | 7 +- tests/hiz/hiz-stencil-test-fbo-d24s8.c | 7 +- tests/hiz/hiz-stencil-test-window-depth0.c | 7 +- tests/hiz/hiz-stencil-test-window-depth1.c | 7 +- tests/shaders/activeprogram-bad-program.c | 6 +- tests/shaders/activeprogram-get.c | 6 +- tests/shaders/ati-fs-bad-delete.c | 6 +- tests/shaders/attribute0.c | 6 +- .../shaders/createshaderprogram-attached-shaders.c | 6 +- tests/shaders/createshaderprogram-bad-type.c | 6 +- tests/shaders/fp-abs-01.c | 9 +- tests/shaders/fp-abs-02.c | 9 +- tests/shaders/fp-condition_codes-01.c | 7 +- tests/shaders/fp-fog.c | 6 +- tests/shaders/fp-formats.c | 7 +- tests/shaders/fp-fragment-position.c | 7 +- tests/shaders/fp-incomplete-tex.c | 6 +- tests/shaders/fp-indirections.c | 6 +- tests/shaders/fp-indirections2.c | 7 +- tests/shaders/fp-kil.c | 6 +- tests/shaders/fp-lit-mask.c | 6 +- tests/shaders/fp-lit-src-equals-dst.c | 6 +- tests/shaders/fp-long-alu.c | 7 +- tests/shaders/fp-rfl.c | 8 +- tests/shaders/fp-set-01.c | 7 +- tests/shaders/fp-set-02.c | 9 +- tests/shaders/fp-unpack-01.c | 7 +- tests/shaders/getuniform-01.c | 6 +- tests/shaders/getuniform-02.c | 6 +- .../glsl-arb-fragment-coord-conventions-define.c | 6 +- .../shaders/glsl-arb-fragment-coord-conventions.c | 6 +- tests/shaders/glsl-bindattriblocation.c | 7 +- tests/shaders/glsl-bug-22603.c | 6 +- tests/shaders/glsl-cos.c | 6 +- tests/shaders/glsl-deriv-varyings.c | 6 +- tests/shaders/glsl-derivs.c | 6 +- tests/shaders/glsl-dlist-getattriblocation.c | 7 +- tests/shaders/glsl-empty-vs-no-fs.c | 6 +- tests/shaders/glsl-explicit-location-01.c | 6 +- tests/shaders/glsl-explicit-location-02.c | 6 +- tests/shaders/glsl-explicit-location-03.c | 6 +- tests/shaders/glsl-explicit-location-04.c | 6 +- tests/shaders/glsl-explicit-location-05.c | 6 +- tests/shaders/glsl-fs-bug25902.c | 6 +- tests/shaders/glsl-fs-color-matrix.c | 6 +- tests/shaders/glsl-fs-discard-02.c | 6 +- tests/shaders/glsl-fs-exp2.c | 6 +- tests/shaders/glsl-fs-flat-color.c | 6 +- tests/shaders/glsl-fs-fogcolor-statechange.c | 6 +- tests/shaders/glsl-fs-fragcoord-zw-ortho.c | 7 +- tests/shaders/glsl-fs-fragcoord-zw-perspective.c | 6 +- tests/shaders/glsl-fs-fragcoord.c | 6 +- tests/shaders/glsl-fs-loop-nested.c | 6 +- tests/shaders/glsl-fs-loop.c | 6 +- tests/shaders/glsl-fs-mix-constant.c | 6 +- tests/shaders/glsl-fs-mix.c | 6 +- tests/shaders/glsl-fs-pointcoord.c | 7 +- tests/shaders/glsl-fs-raytrace-bug27060.c | 6 +- tests/shaders/glsl-fs-sampler-numbering.c | 6 +- tests/shaders/glsl-fs-shader-stencil-export.c | 6 +- tests/shaders/glsl-fs-sqrt-branch.c | 6 +- tests/shaders/glsl-fs-sqrt-zero.c | 6 +- tests/shaders/glsl-fs-texture2drect.c | 6 +- tests/shaders/glsl-fs-texturecube-2.c | 7 +- tests/shaders/glsl-fs-texturecube.c | 6 +- .../shaders/glsl-fs-textureenvcolor-statechange.c | 6 +- tests/shaders/glsl-fs-user-varying-ff.c | 6 +- tests/shaders/glsl-fwidth.c | 6 +- tests/shaders/glsl-getactiveuniform-array-size.c | 6 +- tests/shaders/glsl-getactiveuniform-count.c | 6 +- tests/shaders/glsl-getactiveuniform-length.c | 6 +- tests/shaders/glsl-getattriblocation.c | 7 +- tests/shaders/glsl-invalid-asm-01.c | 6 +- tests/shaders/glsl-invalid-asm-02.c | 6 +- tests/shaders/glsl-kwin-blur-1.c | 6 +- tests/shaders/glsl-kwin-blur-2.c | 6 +- tests/shaders/glsl-light-model.c | 6 +- tests/shaders/glsl-link-bug30552.c | 6 +- tests/shaders/glsl-link-bug38015.c | 6 +- tests/shaders/glsl-link-empty-prog-01.c | 7 +- tests/shaders/glsl-link-empty-prog-02.c | 7 +- tests/shaders/glsl-link-initializer-03.c | 7 +- tests/shaders/glsl-link-test.c | 6 +- tests/shaders/glsl-lod-bias.c | 7 +- tests/shaders/glsl-mat-attribute.c | 6 +- tests/shaders/glsl-max-varyings.c | 7 +- tests/shaders/glsl-max-vertex-attrib.c | 6 +- tests/shaders/glsl-novertexdata.c | 7 +- tests/shaders/glsl-orangebook-ch06-bump.c | 6 +- tests/shaders/glsl-preprocessor-comments.c | 6 +- tests/shaders/glsl-reload-source.c | 6 +- tests/shaders/glsl-routing.c | 6 +- tests/shaders/glsl-sin.c | 6 +- tests/shaders/glsl-uniform-out-of-bounds.c | 7 +- tests/shaders/glsl-uniform-update.c | 6 +- tests/shaders/glsl-unused-varying.c | 6 +- tests/shaders/glsl-useprogram-displaylist.c | 6 +- tests/shaders/glsl-vs-arrays.c | 6 +- tests/shaders/glsl-vs-functions.c | 6 +- tests/shaders/glsl-vs-if-bool.c | 6 +- tests/shaders/glsl-vs-loop-nested.c | 6 +- tests/shaders/glsl-vs-loop.c | 6 +- tests/shaders/glsl-vs-mov-after-deref.c | 6 +- tests/shaders/glsl-vs-mvp-statechange.c | 6 +- tests/shaders/glsl-vs-normalscale.c | 6 +- tests/shaders/glsl-vs-point-size.c | 6 +- tests/shaders/glsl-vs-raytrace-bug26691.c | 7 +- tests/shaders/glsl-vs-sqrt-zero.c | 6 +- tests/shaders/glsl-vs-statechange-1.c | 6 +- tests/shaders/glsl-vs-texturematrix-1.c | 6 +- tests/shaders/glsl-vs-texturematrix-2.c | 6 +- tests/shaders/glsl-vs-user-varying-ff.c | 6 +- tests/shaders/gpu_shader4_attribs.c | 6 +- tests/shaders/link-mismatch-layout-01.c | 6 +- tests/shaders/link-mismatch-layout-02.c | 6 +- tests/shaders/link-mismatch-layout-03.c | 6 +- tests/shaders/link-unresolved-function.c | 6 +- tests/shaders/shader_runner.c | 6 +- tests/shaders/sso-simple.c | 6 +- tests/shaders/sso-uniforms-01.c | 6 +- tests/shaders/sso-uniforms-02.c | 6 +- tests/shaders/sso-user-varying-01.c | 6 +- tests/shaders/sso-user-varying-02.c | 6 +- tests/shaders/trinity-fp1.c | 6 +- tests/shaders/useprogram-flushverts-1.c | 6 +- tests/shaders/useprogram-flushverts-2.c | 6 +- tests/shaders/useprogram-inside-begin.c | 6 +- tests/shaders/useprogram-refcount-1.c | 6 +- tests/shaders/useshaderprogram-bad-program.c | 6 +- tests/shaders/useshaderprogram-bad-type.c | 6 +- tests/shaders/useshaderprogram-flushverts-1.c | 6 +- tests/shaders/vp-address-01.c | 9 +- tests/shaders/vp-address-02.c | 9 +- tests/shaders/vp-address-03.c | 9 +- tests/shaders/vp-address-04.c | 9 +- tests/shaders/vp-address-05.c | 9 +- tests/shaders/vp-address-06.c | 9 +- tests/shaders/vp-bad-program.c | 6 +- tests/shaders/vp-clipdistance-01.c | 9 +- tests/shaders/vp-clipdistance-02.c | 9 +- tests/shaders/vp-clipdistance-03.c | 9 +- tests/shaders/vp-clipdistance-04.c | 9 +- tests/shaders/vp-combined-image-units.c | 6 +- tests/shaders/vp-ignore-input.c | 6 +- tests/shaders/vp-max-array.c | 8 +- tests/shaders/vpfp-generic.cpp | 6 +- .../amd_seamless_cubemap_per_texture.c | 6 +- .../api/bindfragdataindexed-invalid-parameters.c | 6 +- tests/spec/arb_blend_func_extended/api/blend-api.c | 6 +- .../arb_blend_func_extended/api/error-at-begin.c | 6 +- .../arb_blend_func_extended/api/getfragdataindex.c | 6 +- .../execution/fbo-extended-blend-explicit.c | 7 +- .../execution/fbo-extended-blend.c | 7 +- tests/spec/arb_color_buffer_float/common.h | 6 +- tests/spec/arb_copy_buffer/copy_buffer_coherency.c | 6 +- tests/spec/arb_copy_buffer/copybuffersubdata.c | 7 +- tests/spec/arb_copy_buffer/dlist.c | 6 +- tests/spec/arb_copy_buffer/get.c | 6 +- tests/spec/arb_copy_buffer/negative-bound-zero.c | 6 +- tests/spec/arb_copy_buffer/negative-bounds.c | 6 +- tests/spec/arb_copy_buffer/negative-mapped.c | 6 +- tests/spec/arb_copy_buffer/overlap.c | 6 +- tests/spec/arb_copy_buffer/targets.c | 6 +- tests/spec/arb_debug_output/api_error.c | 7 +- tests/spec/arb_draw_buffers/state_change.c | 7 +- .../dlist-arb_draw_instanced.c | 7 +- .../draw-elements-instanced-base-vertex.c | 6 +- tests/spec/arb_draw_instanced/execution/dlist.c | 7 +- tests/spec/arb_draw_instanced/execution/elements.c | 6 +- .../execution/negative-arrays-first-negative.c | 7 +- .../execution/negative-elements-type.c | 7 +- .../arb_es2_compatibility-depthrangef.c | 6 +- .../arb_es2_compatibility-drawbuffers.c | 7 +- .../arb_es2_compatibility-fixed-type.c | 6 +- ...rb_es2_compatibility-getshaderprecisionformat.c | 6 +- .../arb_es2_compatibility-maxvectors.c | 6 +- .../arb_es2_compatibility-releaseshadercompiler.c | 6 +- .../arb_es2_compatibility-shadercompiler.c | 6 +- .../fbo-missing-attachment-blit.c | 7 +- .../fbo-missing-attachment-clear.c | 7 +- tests/spec/arb_fragment_program/minmax.c | 7 +- .../get-renderbuffer-internalformat.c | 7 +- ...ufferRenderbuffer-GL_DEPTH_STENCIL_ATTACHMENT.c | 7 +- ...mebufferTexture2D-GL_DEPTH_STENCIL_ATTACHMENT.c | 7 +- tests/spec/arb_instanced_arrays/instanced_arrays.c | 7 +- .../map_buffer_range_error_check.c | 6 +- .../arb_map_buffer_range/map_buffer_range_test.c | 7 +- tests/spec/arb_multisample/beginend.c | 7 +- tests/spec/arb_multisample/pushpop.c | 7 +- tests/spec/arb_robustness/client-mem-bounds.c | 6 +- tests/spec/arb_robustness/draw-vbo-bounds.c | 6 +- .../spec/arb_sampler_objects/sampler-incomplete.c | 8 +- tests/spec/arb_sampler_objects/sampler-objects.c | 7 +- .../arb_seamless_cube_map/arb_seamless_cubemap.c | 6 +- .../bindattriblocation-scratch-name.c | 7 +- tests/spec/arb_shader_objects/clear-with-deleted.c | 7 +- tests/spec/arb_shader_objects/delete-repeat.c | 7 +- .../arb_shader_objects/getactiveuniform-beginend.c | 7 +- tests/spec/arb_shader_objects/getuniform.c | 7 +- .../getuniformlocation-array-of-struct-of-array.c | 6 +- .../arb_shader_texture_lod/execution/texgrad.c | 7 +- tests/spec/arb_texture_buffer_object/dlist.c | 7 +- tests/spec/arb_texture_buffer_object/formats.c | 7 +- tests/spec/arb_texture_buffer_object/get.c | 7 +- tests/spec/arb_texture_buffer_object/minmax.c | 7 +- .../arb_texture_buffer_object/negative-bad-bo.c | 7 +- .../negative-bad-format.c | 7 +- .../negative-bad-target.c | 7 +- tests/spec/arb_texture_buffer_object/unused-name.c | 7 +- .../internal-format-query.c | 6 +- .../spec/arb_texture_compression/invalid-formats.c | 6 +- .../spec/arb_texture_float/texture-float-formats.c | 7 +- tests/spec/arb_texture_storage/texture-storage.c | 6 +- tests/spec/arb_transform_feedback2/draw-auto.c | 7 +- .../getuniformblockindex.c | 8 +- .../arb_uniform_buffer_object/getuniformindices.c | 8 +- .../arb_uniform_buffer_object/getuniformlocation.c | 8 +- .../spec/arb_uniform_buffer_object/layout-std140.c | 8 +- tests/spec/arb_uniform_buffer_object/minmax.c | 7 +- .../elements-negative-offset.c | 6 +- .../mixed-immediate-and-vbo.c | 6 +- .../spec/arb_vertex_program/getenv4d-with-error.c | 6 +- .../arb_vertex_program/getlocal4d-with-error.c | 6 +- tests/spec/arb_vertex_program/minmax.c | 7 +- .../draw-vertices-2101010.c | 6 +- tests/spec/ati_draw_buffers/arbfp-no-index.c | 7 +- tests/spec/ati_draw_buffers/arbfp-no-option.c | 7 +- tests/spec/ati_draw_buffers/arbfp.c | 7 +- tests/spec/ati_envmap_bumpmap/bump.c | 8 +- tests/spec/ext_fog_coord/modes.c | 7 +- .../spec/ext_framebuffer_multisample/accuracy.cpp | 7 +- tests/spec/ext_framebuffer_multisample/dlist.c | 7 +- tests/spec/ext_framebuffer_multisample/formats.cpp | 6 +- .../ext_framebuffer_multisample/line-smooth.cpp | 7 +- tests/spec/ext_framebuffer_multisample/minmax.c | 7 +- .../multisample-blit.cpp | 6 +- .../negative-copypixels.c | 7 +- .../negative-copyteximage.c | 7 +- .../negative-max-samples.c | 7 +- .../negative-mismatched-samples.c | 7 +- .../negative-readpixels.c | 7 +- .../ext_framebuffer_multisample/point-smooth.cpp | 7 +- .../ext_framebuffer_multisample/polygon-smooth.cpp | 7 +- .../renderbuffer-samples.c | 7 +- .../renderbufferstorage-samples.c | 7 +- tests/spec/ext_framebuffer_multisample/samples.c | 7 +- .../ext_framebuffer_multisample/turn-on-off.cpp | 6 +- .../ext_framebuffer_multisample/unaligned-blit.cpp | 7 +- .../spec/ext_framebuffer_multisample/upsample.cpp | 7 +- .../ext_packed_depth_stencil/readpixels-24_8.c | 8 +- .../getteximage-invalid-format-for-packed-type.c | 6 +- tests/spec/ext_packed_float/pack.c | 6 +- tests/spec/ext_texture_array/maxlayers.c | 8 +- tests/spec/ext_texture_integer/api-drawpixels.c | 6 +- tests/spec/ext_texture_integer/api-readpixels.c | 6 +- tests/spec/ext_texture_integer/api-teximage.c | 6 +- tests/spec/ext_texture_integer/fbo-blending.c | 6 +- .../fbo-integer-precision-clear.c | 6 +- .../fbo-integer-readpixels-sint-uint.c | 6 +- .../ext_texture_integer/getteximage-clamping.c | 6 +- .../ext_texture_integer/texture-integer-glsl130.c | 6 +- tests/spec/ext_timer_query/time-elapsed.c | 7 +- tests/spec/ext_transform_feedback/alignment.c | 7 +- tests/spec/ext_transform_feedback/api-errors.c | 7 +- tests/spec/ext_transform_feedback/buffer-usage.c | 7 +- .../spec/ext_transform_feedback/builtin-varyings.c | 7 +- tests/spec/ext_transform_feedback/discard-api.c | 7 +- tests/spec/ext_transform_feedback/discard-bitmap.c | 7 +- tests/spec/ext_transform_feedback/discard-clear.c | 7 +- .../ext_transform_feedback/discard-copypixels.c | 7 +- .../ext_transform_feedback/discard-drawarrays.c | 7 +- .../ext_transform_feedback/discard-drawpixels.c | 7 +- tests/spec/ext_transform_feedback/generatemipmap.c | 8 +- .../spec/ext_transform_feedback/get-buffer-state.c | 7 +- .../spec/ext_transform_feedback/immediate-reuse.c | 7 +- tests/spec/ext_transform_feedback/interleaved.c | 7 +- .../spec/ext_transform_feedback/intervening-read.c | 7 +- tests/spec/ext_transform_feedback/max-varyings.c | 7 +- tests/spec/ext_transform_feedback/negative-prims.c | 7 +- tests/spec/ext_transform_feedback/order.c | 8 +- tests/spec/ext_transform_feedback/output-type.c | 7 +- .../ext_transform_feedback/overflow-edge-cases.c | 7 +- tests/spec/ext_transform_feedback/position.c | 7 +- tests/spec/ext_transform_feedback/separate.c | 7 +- tests/spec/ext_transform_feedback/tessellation.c | 7 +- .../spec/ext_unpack_subimage/ext_unpack_subimage.c | 6 +- tests/spec/gl-2.0/api/clip-flag-behavior.c | 6 +- .../gl-2.0/api/getattriblocation-conventional.c | 6 +- tests/spec/gl-2.0/vertex-program-two-side.c | 6 +- tests/spec/gl-2.1/minmax.c | 7 +- .../gl-3.0/api/bindfragdata-invalid-parameters.c | 6 +- tests/spec/gl-3.0/api/bindfragdata-link-error.c | 6 +- .../gl-3.0/api/bindfragdata-nonexistent-variable.c | 6 +- tests/spec/gl-3.0/api/clearbuffer-common.c | 6 +- tests/spec/gl-3.0/api/clearbuffer-invalid-buffer.c | 6 +- .../gl-3.0/api/clearbuffer-invalid-drawbuffer.c | 6 +- tests/spec/gl-3.0/api/getfragdatalocation.c | 6 +- tests/spec/gl-3.0/minmax.c | 7 +- .../required-renderbuffer-attachment-formats.c | 7 +- tests/spec/gl-3.0/required-sized-texture-formats.c | 7 +- .../gl-3.0/required-texture-attachment-formats.c | 7 +- tests/spec/gl-3.1/minmax.c | 7 +- .../execution/clipping/clip-plane-transformation.c | 7 +- .../execution/glsl-render-after-bad-attach.c | 6 +- tests/spec/glsl-1.20/recursion/recursion.c | 6 +- .../execution/clipping/max-clip-distances.c | 6 +- tests/spec/glsl-1.30/execution/fs-discard-exit-2.c | 6 +- tests/spec/glsl-1.30/execution/fs-texelFetch-2D.c | 6 +- .../glsl-1.30/execution/fs-texelFetchOffset-2D.c | 6 +- tests/spec/glsl-1.30/execution/isinf-and-isnan.c | 8 +- tests/spec/glsl-1.30/execution/vertexid-beginend.c | 7 +- .../spec/glsl-1.30/execution/vertexid-drawarrays.c | 7 +- .../glsl-1.30/execution/vertexid-drawelements.c | 7 +- ...xing-clip-distance-and-clip-vertex-disallowed.c | 6 +- tests/spec/glsl-1.30/texel-offset-limits.c | 6 +- tests/spec/glsl-1.40/tf-no-position.c | 7 +- .../nv_conditional_render/begin-while-active.c | 7 +- tests/spec/nv_conditional_render/begin-zero.c | 7 +- tests/spec/nv_conditional_render/bitmap.c | 7 +- tests/spec/nv_conditional_render/blitframebuffer.c | 7 +- tests/spec/nv_conditional_render/clear.c | 7 +- tests/spec/nv_conditional_render/copypixels.c | 7 +- tests/spec/nv_conditional_render/copyteximage.c | 7 +- tests/spec/nv_conditional_render/copytexsubimage.c | 7 +- tests/spec/nv_conditional_render/dlist.c | 7 +- tests/spec/nv_conditional_render/drawpixels.c | 7 +- tests/spec/nv_conditional_render/generatemipmap.c | 7 +- tests/spec/nv_conditional_render/vertex_array.c | 7 +- tests/spec/nv_texture_barrier/blending-in-shader.c | 7 +- .../oes_compressed_etc1_rgb8_texture-basic.c | 7 +- .../oes_compressed_paletted_texture-api.c | 7 +- tests/spec/oes_draw_texture/oes_draw_texture.c | 6 +- tests/texturing/1-1-linear-texture.c | 7 +- tests/texturing/array-texture.c | 8 +- tests/texturing/compressedteximage.c | 6 +- tests/texturing/copyteximage-border.c | 7 +- tests/texturing/copyteximage-clipping.c | 7 +- tests/texturing/copyteximage.c | 9 +- tests/texturing/copytexsubimage.c | 6 +- tests/texturing/crossbar.c | 7 +- tests/texturing/cubemap.c | 7 +- tests/texturing/depth-cube-map.c | 6 +- tests/texturing/depth-level-clamp.c | 7 +- tests/texturing/depth-tex-compare.c | 7 +- tests/texturing/depth-tex-modes-glsl.c | 6 +- tests/texturing/depth-tex-modes-rg.c | 7 +- tests/texturing/depth-tex-modes.c | 7 +- tests/texturing/depthstencil-render-miplevels.cpp | 7 +- tests/texturing/fragment-and-vertex-texturing.c | 7 +- tests/texturing/fxt1-teximage.c | 6 +- tests/texturing/gen-compressed-teximage.c | 6 +- tests/texturing/gen-nonzero-unit.c | 6 +- tests/texturing/gen-teximage.c | 6 +- tests/texturing/gen-texsubimage.c | 6 +- tests/texturing/getteximage-formats.c | 6 +- tests/texturing/getteximage-luminance.c | 7 +- tests/texturing/getteximage-simple.c | 7 +- tests/texturing/incomplete-texture.c | 7 +- tests/texturing/levelclamp.c | 7 +- tests/texturing/lodbias.c | 8 +- tests/texturing/lodclamp-between-max.c | 7 +- tests/texturing/lodclamp-between.c | 7 +- tests/texturing/lodclamp.c | 7 +- tests/texturing/max-texture-size.c | 6 +- tests/texturing/mipmap-setup.c | 7 +- tests/texturing/rg-draw-pixels.c | 6 +- tests/texturing/rg-teximage-01.c | 7 +- tests/texturing/rg-teximage-02.c | 7 +- tests/texturing/rgtc-teximage-01.c | 7 +- tests/texturing/rgtc-teximage-02.c | 7 +- tests/texturing/s3tc-teximage.c | 6 +- tests/texturing/s3tc-texsubimage.c | 6 +- tests/texturing/sampler-cube-shadow.c | 6 +- tests/texturing/shaders/texelFetch.c | 6 +- tests/texturing/shaders/textureSize.c | 6 +- tests/texturing/sized-texture-format-channels.c | 7 +- tests/texturing/streaming-texture-leak.c | 6 +- tests/texturing/tex-border-1.c | 7 +- tests/texturing/tex-miplevel-selection.c | 7 +- tests/texturing/tex-skipped-unit.c | 7 +- tests/texturing/tex-srgb.c | 6 +- tests/texturing/tex-swizzle.c | 6 +- tests/texturing/tex3d-maxsize.c | 6 +- tests/texturing/tex3d-npot.c | 6 +- tests/texturing/tex3d.c | 6 +- tests/texturing/texdepth.c | 10 +- tests/texturing/teximage-errors.c | 6 +- tests/texturing/texrect-many.c | 6 +- tests/texturing/texredefine.c | 6 +- tests/texturing/texsubimage.c | 7 +- tests/texturing/texture-al.c | 6 +- tests/texturing/texture-integer.c | 7 +- tests/texturing/texture-packed-formats.c | 7 +- tests/texturing/texture-rg.c | 6 +- tests/texturing/texwrap.c | 8 +- tests/util/CMakeLists.txt | 1 + tests/util/piglit-framework-fbo.c | 23 +- tests/util/piglit-framework-fbo.h | 11 +- tests/util/piglit-framework-glut.c | 141 +++++++++ tests/util/piglit-framework-glut.h | 33 +++ tests/util/piglit-framework.c | 136 +++------ tests/util/piglit-framework.h | 105 ++++++- tests/util/piglit-util.c | 18 -- tests/util/piglit-util.h | 27 +- 620 files changed, 3431 insertions(+), 1750 deletions(-) create mode 100644 include/msvc/c99/inttypes.h create mode 100644 include/msvc/c99/stdbool.h create mode 100644 include/msvc/c99/stdint.h create mode 100644 tests/util/piglit-framework-glut.c create mode 100644 tests/util/piglit-framework-glut.h -- 1.7.10.4 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/piglit