summaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa ↵Julien Cristau2009-12-2973-323/+334
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into debian-unstable 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/texcomp_image.h 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 scons/gallium.py scons/generic.py
| * 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)
| * 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/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 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa ↵Brice Goglin2009-12-113-2/+13
|\| | | | | | | | | | | | | | | into debian-unstable Conflicts: progs/tests/Makefile progs/tests/prog_parameter.c
| * progs/samples: Byte swap individual members of struct _rawImageRec.Vinson Lee2009-12-101-1/+6
| |
| * progs/util: Byte swap individual members of struct _rawImageRec.Vinson Lee2009-12-101-1/+6
| |
| * progs/test: Initialize variable in prog_parameter.Vinson Lee2009-12-071-0/+5
| | | | | | | | Silences uninitialized variable compiler warning.
| * progs/demos: Fix memory leak in projtex.c.Vinson Lee2009-12-071-0/+1
| |
| * progs/tests: Add tests to Makefile.Vinson Lee2009-12-051-0/+7
| | | | | | | | (cherry picked from commit 76d2ec3a0a047a65ffca70f53848241a3225dad3)
* | Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa ↵Brice Goglin2009-12-0529-42/+120
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into debian-unstable Conflicts: progs/fp/Makefile progs/fp/fp-tri.c progs/fp/point-position.c progs/fp/tri-depth.c progs/fp/tri-depth2.c progs/fp/tri-depthwrite.c progs/fp/tri-depthwrite2.c progs/fp/tri-inv.c progs/fp/tri-param.c progs/fp/tri-tex.c progs/tests/Makefile progs/tests/SConscript progs/tests/arraytexture.c progs/tests/copypixrate.c progs/tests/crossbar.c progs/tests/drawbuffers.c progs/tests/invert.c progs/tests/minmag.c progs/tests/mipmap_comp.c progs/tests/prog_parameter.c progs/tests/random.c progs/tests/shader_api.c progs/tests/stencil_twoside.c progs/tests/texcmp.c progs/tests/texdown.c progs/tests/vao-01.c progs/tests/vao-02.c progs/trivial/clear-fbo-tex.c progs/trivial/clear-fbo.c progs/trivial/clear-random.c progs/trivial/clear-scissor.c progs/trivial/clear.c progs/trivial/createwin.c progs/trivial/dlist-begin-call-end.c progs/trivial/dlist-dangling.c progs/trivial/dlist-edgeflag-dangling.c progs/trivial/dlist-edgeflag.c progs/trivial/dlist-flat-tri.c progs/trivial/dlist-mat-tri.c progs/trivial/dlist-recursive-call.c progs/trivial/dlist-tri-flat-tri.c progs/trivial/dlist-tri-mat-tri.c progs/trivial/line-clip.c progs/trivial/line-cull.c progs/trivial/line-flat.c progs/trivial/line-stipple-wide.c progs/trivial/line-userclip-clip.c progs/trivial/line-userclip-nop-clip.c progs/trivial/line-userclip-nop.c progs/trivial/line-userclip.c progs/trivial/line-wide.c progs/trivial/line.c progs/trivial/lineloop-clip.c progs/trivial/lineloop.c progs/trivial/linestrip-clip.c progs/trivial/linestrip-flat-stipple.c progs/trivial/linestrip-stipple-wide.c progs/trivial/linestrip-stipple.c progs/trivial/linestrip.c progs/trivial/point-clip.c progs/trivial/point-param.c progs/trivial/point-sprite.c progs/trivial/point-wide-smooth.c progs/trivial/point-wide.c progs/trivial/point.c progs/trivial/poly-flat-clip.c progs/trivial/poly-flat-unfilled-clip.c progs/trivial/poly-flat.c progs/trivial/poly-unfilled.c progs/trivial/poly.c progs/trivial/quad-clip-all-vertices.c progs/trivial/quad-clip.c progs/trivial/quad-degenerate.c progs/trivial/quad-flat.c progs/trivial/quad-offset-factor.c progs/trivial/quad-offset-unfilled.c progs/trivial/quad-offset-units.c progs/trivial/quad-tex-alpha.c progs/trivial/quad-tex-pbo.c progs/trivial/quad-unfilled-clip.c progs/trivial/quad-unfilled-stipple.c progs/trivial/quad-unfilled.c progs/trivial/quad.c progs/trivial/quads.c progs/trivial/quadstrip-cont.c progs/trivial/quadstrip-flat.c progs/trivial/quadstrip.c progs/trivial/readpixels.c progs/trivial/tri-alpha-tex.c progs/trivial/tri-alpha.c progs/trivial/tri-blend-color.c progs/trivial/tri-clear.c progs/trivial/tri-clip.c progs/trivial/tri-cull-both.c progs/trivial/tri-dlist.c progs/trivial/tri-fbo.c progs/trivial/tri-flat-clip.c progs/trivial/tri-flat.c progs/trivial/tri-fog.c progs/trivial/tri-fp-const-imm.c progs/trivial/tri-fp.c progs/trivial/tri-lit-material.c progs/trivial/tri-lit.c progs/trivial/tri-multitex-vbo.c progs/trivial/tri-orig.c progs/trivial/tri-query.c progs/trivial/tri-scissor-tri.c progs/trivial/tri-square.c progs/trivial/tri-stipple.c progs/trivial/tri-tex-3d.c progs/trivial/tri-tex.c progs/trivial/tri-tri.c progs/trivial/tri-unfilled-clip.c progs/trivial/tri-unfilled-edgeflag.c progs/trivial/tri-unfilled-point.c progs/trivial/tri-unfilled-smooth.c progs/trivial/tri-unfilled-tri-lit.c progs/trivial/tri-unfilled-tri.c progs/trivial/tri-unfilled-userclip-stip.c progs/trivial/tri-unfilled-userclip.c progs/trivial/tri-unfilled.c progs/trivial/tri-userclip.c progs/trivial/tri-z-9.c progs/trivial/tri-z-eq.c progs/trivial/trifan-flat-clip.c progs/trivial/trifan-flat-unfilled-clip.c progs/trivial/trifan-flat.c progs/trivial/trifan-unfilled.c progs/trivial/trifan.c progs/trivial/tristrip-clip.c progs/trivial/tristrip-flat.c progs/trivial/tristrip.c progs/trivial/vp-tri-cb-pos.c progs/trivial/vp-tri-cb-tex.c progs/trivial/vp-tri-invariant.c progs/vp/vp-tris.c progs/vpglsl/psiz-mul.glsl progs/vpglsl/vp-tris.c
| * progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.Vinson Lee2009-12-051-0/+1
| |
| * progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.Vinson Lee2009-12-051-1/+2
| |
| * progs/samples: Add rgbtoppm to Makefile.Vinson Lee2009-12-051-1/+1
| |
| * progs/tests: Removed unused variable from texdown.c.Vinson Lee2009-12-051-2/+1
| |
| * progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.Vinson Lee2009-12-051-6/+6
| | | | | | | | The return type of glGetUniformLocationARB is GLint, not GLuint.
| * progs/fp: Redraw upon keypress.Vinson Lee2009-12-041-1/+1
| |
| * progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.Vinson Lee2009-12-041-0/+1
| | | | | | | | (cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50)
| * progs/util: Fix memory leak if fail to load/compile shaderVinson Lee2009-12-041-0/+2
| | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab)
| * progs/fp: Add tri-inv.c to Makefile.Vinson Lee2009-12-041-0/+1
| |
| * progs/xdemos: fix some visual/fbconfig logic in glxinfo.cBrian Paul2009-12-041-3/+12
| | | | | | | | | | | | | | The fbAttribSingle/Double arrays had wrong GLX_DOUBLEBUFFER values. We only need to use the glXChooseFBConfig() code when glXChooseVisual() fails (but I don't know when that would happen). Other recent commits errantly removed some code in this area too.
| * progs/xdemos: Silence unused value warnings in sharedtex_mt.c.Vinson Lee2009-12-041-4/+4
| | | | | | | | (cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61)
| * progs/xdemos: Fix memory leak in pbdemo.c.Vinson Lee2009-12-041-0/+1
| | | | | | | | (cherry picked from commit e0857962b911ef317238498305651515d83029ae)
| * progs/xdemos: Add missing break statement in offset.c.Vinson Lee2009-12-041-0/+1
| | | | | | | | (cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07)
| * progs/xdemos: Remove duplicate code in glxinfo.c.Vinson Lee2009-12-031-2/+0
| | | | | | | | (cherry picked from commit a4720a1a3206dd2edecf47a21fce547a79b67610)
| * progs/xdemos: Fix memory leak in glxinfo.c.Vinson Lee2009-12-031-1/+3
| | | | | | | | (cherry picked from commit f080567f4c4018c4885c105a154cb0eb39e6234f)
| * progs/xdemos: Add assert in corender.c.Vinson Lee2009-12-031-0/+1
| | | | | | | | (cherry picked from commit 66a4ec14c38d407256545e0cf31c98974d621fe4)
| * progs/vp: Fix memory leak in vp-tris.c.Vinson Lee2009-12-031-0/+2
| | | | | | | | (cherry picked from commit 760cf71572a071ce43da576ebfeff4a8099150bc)
| * progs/tests: Fix memory leak in texdown.c if malloc fails.Vinson Lee2009-12-031-0/+2
| | | | | | | | (cherry picked from commit e3cfd78969cd4a94fc83a5d6fb2f33730cc4e70f)
| * progs/redbook: Fix memory leak in quadric.c.Vinson Lee2009-12-031-0/+2
| | | | | | | | (cherry picked from commit 47b5f584a68ceab7c9c1d5279efbc9fe30ff2fcc)
| * progs/glsl: Fix memory leak in deriv.c.Vinson Lee2009-12-031-0/+1
| | | | | | | | (cherry picked from commit 0e783c7d03128aade3ca50b28a56e254fef6b6ab)
| * progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.Vinson Lee2009-12-031-1/+1
| | | | | | | | | | | | | | tangentAtrrib is assigned the result of glGetAttribLocation. The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if tangentAttrib is a GLuint. (cherry picked from commit b8dcb79c53796f37234bd2b0f5e2845f817fc218)
| * progs/demos: Fix memory leak in ray.c.Vinson Lee2009-12-031-0/+2
| | | | | | | | (cherry picked from commit 6b480dc21dd489d48685b2268e495218aea74293)
| * progs/demos: Fix memory leak in projtex.c.Vinson Lee2009-12-031-0/+3
| | | | | | | | (cherry picked from commit ee555e3d69c8820f27e71e5ebc028a768cef7d0b)
| * progs/demos: Fix memory leak in ipers.c.Vinson Lee2009-12-031-0/+2
| | | | | | | | (cherry picked from commit a1afe303deda320aadacdaf5b1c72631ca3f734f)
| * progs/demos: Fix memory leak in fslight.c.Vinson Lee2009-12-031-0/+1
| | | | | | | | (cherry picked from commit aef3218f0bb48fdb286d2008ee07e507ea8aa98e)