summaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-experimental' into debian-experimentalBrice Goglin2010-01-1121-105/+211
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/egl/eglgears.c progs/egl/eglscreen.c progs/fp/Makefile progs/fp/SConscript progs/rbug/simple_server.c progs/tests/getprocaddress.c progs/tests/interleave.c progs/tests/texwrap.c progs/tests/vparray.c progs/vp/vp-tris.c src/glut/glx/win32_menu.c
| * progs/demos: Remove unnecessary header from fbotexture.c.Vinson Lee2010-01-111-1/+0
| |
| * progs/demos: Check upper bounds of input in manywin.c.Vinson Lee2010-01-101-0/+2
| |
| * progs/demos: Bounds check input to fire.c.Vinson Lee2010-01-101-1/+7
| |
| * progs/tests: Silence 'missing initializer' warnings.Vinson Lee2010-01-082-2/+2
| |
| * progs/glsl: Silence uninitialized variable warning.Vinson Lee2010-01-081-1/+1
| |
| * progs/demos: Add missing initializers in engine.c.Vinson Lee2010-01-081-3/+15
| |
| * progs/fp: remove invalid tri-inv.c testBrian Paul2010-01-073-113/+0
| | | | | | | | INV is not a valid instruction.
| * progs/demos: Assert that input to malloc is valid.Vinson Lee2010-01-061-0/+2
| |
| * progs/xdemos: Check for string overflow.Vinson Lee2010-01-061-3/+29
| |
| * progs/xdemos: Check for string overflow.Vinson Lee2010-01-061-0/+4
| |
| * progs/xdemos: Remove comma at end of enumerator list.Vinson Lee2010-01-061-1/+1
| |
| * progs/xdemos: Use temporary variables.Vinson Lee2010-01-061-2/+2
| | | | | | | | This was missed from the previous commit to glxheads.c.
| * progs/glsl: Prevent possible string overflow.Vinson Lee2010-01-061-0/+4
| |
| * progs/xdemos: Prevent possible string overflow.Vinson Lee2010-01-061-1/+27
| |
| * progs/egl: Silence uninitialized variable warnings.Vinson Lee2010-01-032-2/+4
| |
| * progs/samples: Silence compiler warnings.Vinson Lee2010-01-031-7/+18
| |
| * progs/vp: Ensure null-terminated byte string.Vinson Lee2010-01-031-1/+2
| |
| * progs/tests: Silence uninitialized variable warning.Vinson Lee2010-01-021-1/+1
| |
| * progs/tests: Silence warn_unused_result warning.Vinson Lee2010-01-021-5/+8
| |
| * progs/samples: 'Silence no previous prototype' warnings.Vinson Lee2010-01-017-58/+58
| |
| * progs/rbug: s/wait/rbug_wait/Vinson Lee2010-01-011-2/+2
| | | | | | | | wait conflicts with wait in /usr/include/sys/wait.h.
| * progs/glsl: Provide a better fix for fgets warning.Vinson Lee2009-12-301-5/+2
| |
| * progs/glsl: Silence compiler warnings.Vinson Lee2009-12-292-10/+3
| |
| * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-274-15/+39
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h
| | * progs/demos: Silence warn_unused_result warnings.Vinson Lee2009-12-263-9/+25
| | |
| | * progs/util: Silence warn_unused_result warnings.Vinson Lee2009-12-251-6/+14
| | |
| | * progs/perf: Fix MSVC build.Vinson Lee2009-12-211-1/+1
| | | | | | | | | | | | (cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170)
* | | Delete some files not present in tarballsJulien Cristau2009-12-2573-12126/+0
| | |
* | | Merge remote branch 'upstream/mesa_7_7_branch' into debian-experimentalJulien Cristau2009-12-2570-313/+305
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/tests/bug_texstore_i8.c progs/tests/crossbar.c progs/tests/cva.c progs/tests/fptest1.c progs/tests/invert.c progs/tests/packedpixels.c progs/tests/quads.c progs/tests/scissor-viewport.c progs/tests/scissor.c progs/tests/stencilwrap.c progs/tests/tex1d.c progs/tests/unfilledclip.c progs/tests/vpeval.c progs/trivial/clear-fbo-tex.c progs/trivial/createwin.c progs/trivial/dlist-begin-call-end.c progs/trivial/draw2arrays.c progs/trivial/drawarrays.c progs/trivial/tri-blend-max.c progs/trivial/tri-blend-min.c progs/trivial/tri-blend-revsub.c progs/trivial/tri-blend-sub.c progs/trivial/tri-blend.c progs/trivial/tri-fbo-tex.c progs/trivial/tri-fp.c progs/trivial/tri-logicop-none.c progs/trivial/tri-logicop-xor.c progs/trivial/tri-z.c progs/trivial/vbo-drawarrays.c progs/trivial/vbo-noninterleaved.c src/glut/glx/glut_menu.c
| * | progs/tests: Fix build.Vinson Lee2009-12-221-1/+0
| | |
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-2187-323/+318
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac progs/demos/morph3d.c progs/demos/textures.c progs/glsl/shtest.c progs/glsl/texaaline.c progs/tests/packedpixels.c progs/xdemos/corender.c src/mesa/main/version.h
| | * progs/redbook: Silence compiler warnings.Vinson Lee2009-12-2162-296/+283
| | |
| | * progs/tests: Silence compiler warnings.Vinson Lee2009-12-2011-10/+19
| | |
| | * progs/trivial: Use C-style comments.Vinson Lee2009-12-1910-12/+12
| | |
| | * progs/xdemos: Use C-style comment.Vinson Lee2009-12-191-1/+1
| | |
| | * progs/demos: Silence compiler warning in morph3d.c.Vinson Lee2009-12-181-1/+1
| | |
| | * progs/glsl: Use C-style comments.Vinson Lee2009-12-182-3/+3
| | |
| | * progs/demos: Use C-style comment.Vinson Lee2009-12-181-1/+1
| | |
| * | progs/perf: added check for GL_ARB_framebuffer_objectBrian Paul2009-12-211-0/+6
| | |
| * | progs/demos: report pixel rate in million pixels / secBrian Paul2009-12-211-4/+5
| | |
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-1511-36/+33
| |\| | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
| | * progs/trivial: Silence compiler warnings.Vinson Lee2009-12-145-15/+12
| | |
| | * progs/trivial: Silence compiler warnings in tri-blend-min.c.Vinson Lee2009-12-121-3/+3
| | |
| | * progs/trivial: Silence compiler warnings in tri-blend-max.cVinson Lee2009-12-121-3/+3
| | |
| | * progs/xdemos: Silence compiler warnings in glxinfo.c.Vinson Lee2009-12-121-2/+2
| | |
| | * progs/tests: Silence compiler warnings in vpeval.c.Vinson Lee2009-12-121-5/+5
| | |
| | * progs/tests: Silence compiler warnings in cva.c.Vinson Lee2009-12-121-4/+4
| | |
| | * progs/redbook: Silence compiler warnings in aaindex.c.Vinson Lee2009-12-121-4/+4
| | |
* | | Merge branch 'upstream-experimental' into debian-experimentalBrice Goglin2009-12-1262-147/+768116
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doxygen/gallium.doc progs/egl/demo1.c progs/egl/demo2.c progs/egl/demo3.c progs/egl/eglgears.c progs/egl/eglinfo.c progs/slang/cltest.c progs/slang/vstest.c progs/tests/arbgpuprog.c progs/tests/getprocaddress.c progs/tests/getteximage.c progs/tests/mipmap_limits.c progs/tests/packedpixels.c progs/tests/sharedtex.c progs/tests/texcmp.c progs/tests/texcomp_image.h progs/tests/texcompsub.c progs/tests/zreaddraw.c scons/crossmingw.py scons/dxsdk.py scons/gallium.py scons/generic.py scons/llvm.py scons/winddk.py src/gallium/state_trackers/xorg/xvmc/tests/.gitignore src/gallium/state_trackers/xorg/xvmc/tests/test_context.c src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c src/gallium/state_trackers/xorg/xvmc/tests/testlib.c src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c windows/VC7/mesa/mesa/mesa.vcproj