summaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Brian Paul2009-12-112-2/+12
|\ | | | | | | | | | | Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
| * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-112-2/+12
| |\
| | * 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
| | |
* | | Merge branch 'mesa_7_7_branch'Andre Maasikas2009-12-089-14/+31
|\| | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/r600/r700_assembler.c src/mesa/main/version.h
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchAndre Maasikas2009-12-081-0/+5
| |\|
| | * progs/test: Initialize variable in prog_parameter.Vinson Lee2009-12-071-0/+5
| | | | | | | | | | | | Silences uninitialized variable compiler warning.
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-078-14/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/demos/projtex.c progs/xdemos/glxinfo.c src/mesa/main/version.h To fix the confilicts in projtex.c and glxinfo.c I just took the code from mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from mesa_7_7_branch to mesa_7_6_branch followed by commmits just to mesa_7_6_branch.
| | * 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)
| | * 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)
| | * progs/trivial: Redraw upon keypress.Vinson Lee2009-12-034-4/+4
| | | | | | | | | | | | (cherry picked from commit 9553a42f638bd98eb90e5b7fb37d6b82758b6363)
| | * progs/trivial: Redraw upon keypress.Vinson Lee2009-12-03104-104/+104
| | | | | | | | | | | | (cherry picked from commit 3790c6a13b86dfe0afd4bb0bf9a4d9f4b429cfd8)
| | * progs/glsl: Redraw upon keypress.Vinson Lee2009-12-031-1/+1
| | | | | | | | | | | | (cherry picked from commit 881f55236ad85f95745e70f8363726fa3c201f80)
| | * progs/util: Exit RawImageGetData early if malloc fails.Vinson Lee2009-12-031-0/+1
| | | | | | | | | | | | | | | Prevents a null pointer deference later on. (cherry picked from commit e26135a744f740430e3dc341fa692544ba99c11e)
| | * progs/util: Fix memory leak if malloc fails in RawImageOpen.Vinson Lee2009-12-031-0/+14
| | | | | | | | | | | | (cherry picked from commit d36cb2396c942f05ba56c5b899792a507bb0f0fd)
| | * progs/util: Fix memory leak if fopen fails in RawImageOpen.Vinson Lee2009-12-031-0/+1
| | | | | | | | | | | | (cherry picked from commit d9508e8df9da4aa13bc223194c406081738bac91)
| | * progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.Vinson Lee2009-12-031-0/+1
| | | | | | | | | | | | (cherry picked from commit 786d539511eb3c5a4101b11b7f8e90d60123ac46)
| | * progs/util: Fix memory leak if LoadRGBImage fails.Vinson Lee2009-12-031-1/+4
| | | | | | | | | | | | (cherry picked from commit 041cd0e110d41b543a0fe9cc484ae8373642912b)
| | * progs/util: Fix memory if LoadRGBMipmaps2 fails.Vinson Lee2009-12-031-0/+1
| | | | | | | | | | | | (cherry picked from commit 28b8e4bcd76cc072b062e4c8575327c05ecb9a55)
| | * progs/util: Fix memory leak if LoadYUVImage fails.Vinson Lee2009-12-031-0/+1
| | | | | | | | | | | | (cherry picked from commit 0e790ac35327a0b53a4a595a6429135317302269)
| | * progs/fp: Redraw upon keypress.Vinson Lee2009-12-038-8/+8
| | | | | | | | | | | | (cherry picked from commit cde66437247feb8b14b6d8f3ec3a8b4665fefa08)
| | * prog/tests: Fix MSVC build.Vinson Lee2009-12-031-4/+4
| | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit 9c3197ef0abc3bf521358ea0c7af0fc6979c82b3)
| | * progs/tests: fix MSVC build.Vinson Lee2009-12-031-4/+4
| | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit a8ed066858f12290239ddc9165b7c0734ccc0247)
| | * progs/tests: Fix MSVC build.Vinson Lee2009-12-031-3/+3
| | | | | | | | | | | | (cherry picked from commit 50e113e375b4ecfdf5b60ccce7bbcdb1c5f2ca11)
| | * progs/tests: Fix MSVC build.Vinson Lee2009-12-031-8/+8
| | | | | | | | | | | | (cherry picked from commit 952bf63e2cf442504ef89b0b1d276da0d52b21d4)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 00:34:41 +0000