summaryrefslogtreecommitdiff
path: root/progs
AgeCommit message (Collapse)Author
2009-12-11Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
2009-12-11Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
2009-12-10progs/samples: Byte swap individual members of struct _rawImageRec.Vinson Lee
2009-12-10progs/util: Byte swap individual members of struct _rawImageRec.Vinson Lee
2009-12-08Merge branch 'mesa_7_7_branch'Andre Maasikas
Conflicts: src/mesa/drivers/dri/r600/r700_assembler.c src/mesa/main/version.h
2009-12-08Merge branch 'mesa_7_6_branch' into mesa_7_7_branchAndre Maasikas
2009-12-07progs/test: Initialize variable in prog_parameter.Vinson Lee
Silences uninitialized variable compiler warning.
2009-12-07Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick
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.
2009-12-07progs/demos: Fix memory leak in projtex.c.Vinson Lee
2009-12-07progs/glsl: updates to deriv.c testBrian Paul
Pass window size into the shader so scaling the window doesn't effect the colors.
2009-12-07progs/glsl: added texture mapping to bump demoBrian Paul
Press 't' to toggle texture map.
2009-12-05progs/tests: Add tests to Makefile.Vinson Lee
(cherry picked from commit 76d2ec3a0a047a65ffca70f53848241a3225dad3)
2009-12-05Add 'texture leak' test.Michel Dänzer
2009-12-05progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.Vinson Lee
2009-12-05progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.Vinson Lee
2009-12-05progs/samples: Add rgbtoppm to Makefile.Vinson Lee
2009-12-05progs/tests: Removed unused variable from texdown.c.Vinson Lee
2009-12-05progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.Vinson Lee
The return type of glGetUniformLocationARB is GLint, not GLuint.
2009-12-04progs/fp: Redraw upon keypress.Vinson Lee
2009-12-04progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.Vinson Lee
(cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50)
2009-12-04progs/util: Fix memory leak if fail to load/compile shaderVinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab)
2009-12-04progs/fp: Add tri-inv.c to Makefile.Vinson Lee
2009-12-04progs/xdemos: fix some visual/fbconfig logic in glxinfo.cBrian Paul
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.
2009-12-04progs/xdemos: Silence unused value warnings in sharedtex_mt.c.Vinson Lee
(cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61)
2009-12-04progs/xdemos: Fix memory leak in pbdemo.c.Vinson Lee
(cherry picked from commit e0857962b911ef317238498305651515d83029ae)
2009-12-04progs/xdemos: Add missing break statement in offset.c.Vinson Lee
(cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07)
2009-12-03progs/xdemos: Remove duplicate code in glxinfo.c.Vinson Lee
(cherry picked from commit a4720a1a3206dd2edecf47a21fce547a79b67610)
2009-12-03progs/xdemos: Fix memory leak in glxinfo.c.Vinson Lee
(cherry picked from commit f080567f4c4018c4885c105a154cb0eb39e6234f)
2009-12-03progs/xdemos: Add assert in corender.c.Vinson Lee
(cherry picked from commit 66a4ec14c38d407256545e0cf31c98974d621fe4)
2009-12-03progs/vp: Fix memory leak in vp-tris.c.Vinson Lee
(cherry picked from commit 760cf71572a071ce43da576ebfeff4a8099150bc)
2009-12-03progs/tests: Fix memory leak in texdown.c if malloc fails.Vinson Lee
(cherry picked from commit e3cfd78969cd4a94fc83a5d6fb2f33730cc4e70f)
2009-12-03progs/redbook: Fix memory leak in quadric.c.Vinson Lee
(cherry picked from commit 47b5f584a68ceab7c9c1d5279efbc9fe30ff2fcc)
2009-12-03progs/glsl: Fix memory leak in deriv.c.Vinson Lee
(cherry picked from commit 0e783c7d03128aade3ca50b28a56e254fef6b6ab)
2009-12-03progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.Vinson Lee
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)
2009-12-03progs/demos: Fix memory leak in ray.c.Vinson Lee
(cherry picked from commit 6b480dc21dd489d48685b2268e495218aea74293)
2009-12-03progs/demos: Fix memory leak in projtex.c.Vinson Lee
(cherry picked from commit ee555e3d69c8820f27e71e5ebc028a768cef7d0b)
2009-12-03progs/demos: Fix memory leak in ipers.c.Vinson Lee
(cherry picked from commit a1afe303deda320aadacdaf5b1c72631ca3f734f)
2009-12-03progs/demos: Fix memory leak in fslight.c.Vinson Lee
(cherry picked from commit aef3218f0bb48fdb286d2008ee07e507ea8aa98e)
2009-12-03progs/trivial: Redraw upon keypress.Vinson Lee
(cherry picked from commit 9553a42f638bd98eb90e5b7fb37d6b82758b6363)
2009-12-03progs/trivial: Redraw upon keypress.Vinson Lee
(cherry picked from commit 3790c6a13b86dfe0afd4bb0bf9a4d9f4b429cfd8)
2009-12-03progs/glsl: Redraw upon keypress.Vinson Lee
(cherry picked from commit 881f55236ad85f95745e70f8363726fa3c201f80)
2009-12-03progs/util: Exit RawImageGetData early if malloc fails.Vinson Lee
Prevents a null pointer deference later on. (cherry picked from commit e26135a744f740430e3dc341fa692544ba99c11e)
2009-12-03progs/util: Fix memory leak if malloc fails in RawImageOpen.Vinson Lee
(cherry picked from commit d36cb2396c942f05ba56c5b899792a507bb0f0fd)
2009-12-03progs/util: Fix memory leak if fopen fails in RawImageOpen.Vinson Lee
(cherry picked from commit d9508e8df9da4aa13bc223194c406081738bac91)
2009-12-03progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.Vinson Lee
(cherry picked from commit 786d539511eb3c5a4101b11b7f8e90d60123ac46)
2009-12-03progs/util: Fix memory leak if LoadRGBImage fails.Vinson Lee
(cherry picked from commit 041cd0e110d41b543a0fe9cc484ae8373642912b)
2009-12-03progs/util: Fix memory if LoadRGBMipmaps2 fails.Vinson Lee
(cherry picked from commit 28b8e4bcd76cc072b062e4c8575327c05ecb9a55)
2009-12-03progs/util: Fix memory leak if LoadYUVImage fails.Vinson Lee
(cherry picked from commit 0e790ac35327a0b53a4a595a6429135317302269)
2009-12-03progs/fp: Redraw upon keypress.Vinson Lee
(cherry picked from commit cde66437247feb8b14b6d8f3ec3a8b4665fefa08)
2009-12-03prog/tests: Fix MSVC build.Vinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 9c3197ef0abc3bf521358ea0c7af0fc6979c82b3)
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 12:37:42 +0000