summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Andre Maasikas2009-12-0829-88/+232
|\ | | | | | | | | | | 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-084-21/+18
| |\
| | * r600: add support for TXB instructionAndre Maasikas2009-12-081-17/+9
| | | | | | | | | | | | | | | makes testing other things easier - does not hang the card TODO: enable TEX dependency tracking in vertex programs
| | * r600: reorder state for render_target and blendAndre Maasikas2009-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | First time around render targets are not enabled yet (done in r700SendRenderTargetState) so blend state is not emitted for any targets. Affects first glClear in some mesa tests. As a quick fix reorder state emit so that target is set first
| | * llvmpipe: Initialize variables in emit_instruction.Vinson Lee2009-12-071-3/+3
| | |
| | * progs/test: Initialize variable in prog_parameter.Vinson Lee2009-12-071-0/+5
| | | | | | | | | | | | Silences uninitialized variable compiler warning.
| * | mesa: set version string to 7.7-rc1mesa_7_7_rc2Ian Romanick2009-12-072-2/+2
| | | | | | | | | | | | Also modify the Makefile to use the correct version for the tarballs.
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-0714-39/+58
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * mesa: set version string to 7.6.1-rc3mesa_7_6_1_rc3Ian Romanick2009-12-071-1/+1
| | |
| | * progs/demos: Fix memory leak in projtex.c.Vinson Lee2009-12-071-0/+1
| | |
| | * st/egl: Fix memory leak in egl_tracker.c.Vinson Lee2009-12-061-1/+1
| | | | | | | | | | | | (cherry picked from commit 052b127842af3372fd768eae8e29b240a696a12a)
| | * dri: Fix potential null pointer dereference in driBindContext.Vinson Lee2009-12-061-1/+2
| | | | | | | | | | | | (cherry picked from commit 919898e92fa23ff71a59d86a46ff0886a6f34e4d)
| | * dri: Fix potential null pointer deference in dri_put_drawable.Vinson Lee2009-12-061-4/+4
| | | | | | | | | | | | (cherry picked from commit 364070b1f2b08d43fb205ec198894a35bec6b2f3)
| | * glx: Prevent potential null pointer deference in driCreateContext.Vinson Lee2009-12-061-1/+3
| | | | | | | | | | | | (cherry picked from commit 4b0b250aae6ae7d48cd24f9d91d05ab58086c4b2)
| | * progs/tests: Add tests to Makefile.Vinson Lee2009-12-051-0/+7
| | | | | | | | | | | | (cherry picked from commit 76d2ec3a0a047a65ffca70f53848241a3225dad3)
| | * draw: Initialize variable in draw_pt.c.Vinson Lee2009-12-051-1/+2
| | | | | | | | | | | | (cherry picked from commit ea98e9820d7117f7a187f355445796b1ef5d9e0c)
| | * mesa: Fix array out-of-bounds access by _mesa_TexGenf.Vinson Lee2009-12-051-1/+4
| | | | | | | | | | | | | | | | | | _mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument as an array. (cherry picked from commit ca5a7aadb4361e7d053aea8687372cd44cbd8795)
| | * mesa: Fix array out-of-bounds access by _mesa_TexGeni.Vinson Lee2009-12-051-1/+4
| | | | | | | | | | | | | | | | | | _mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument as an array. (cherry picked from commit d55fb7c835b56951f05a058083e7eda264ba192e)
| | * mesa: Fix array out-of-bounds access by _mesa_TexParameterf.Vinson Lee2009-12-051-2/+7
| | | | | | | | | | | | | | | | | | _mesa_TexParameterf calls set_tex_parameterf, which uses the params argument as an array. (cherry picked from commit 270d36da146b899d39e08f830fe34b63833a3731)
| | * mesa: Fix array out-of-bounds access by _mesa_TexParameterf.Vinson Lee2009-12-051-2/+4
| | | | | | | | | | | | | | | | | | _mesa_TexParameterf calls set_tex_parameteri, which uses the params argument as an array. (cherry picked from commit a201dfb6bf28b89d6f511c2ec9ae0d81ef18511d)
| | * 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
| | |
| | * mesa: Fix array out-of-bounds access in _mesa_TexEnvf.Vinson Lee2009-12-041-1/+4
| | | | | | | | | | | | | | | | | | _mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument as an array. (cherry picked from commit a11d60d14caf8efc07f70af63b57b33273f8cf9b)
| | * 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
| | |
| | * r300g: use $(MAKE) variableColeman Kane2009-12-041-1/+1
| | | | | | | | | | | | Fixes bug 24501
| | * 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.
| | * docs: a few more fixes for 7.6.1Brian Paul2009-12-041-0/+2
| | |
| | * radeon: fix polygon stippleAlex Deucher2009-12-044-24/+29
| | | | | | | | | | | | | | | | | | fixes fdo bug 25354 Signed-off-by: Alex Deucher <[email protected]>
| | * glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore.Vinson Lee2009-12-041-0/+1
| | | | | | | | | | | | (cherry picked from commit 808f0376607b0e2d31dfebc888fd8f1e737fed09)
| | * glu/sgi: Fix memory leak in gluBuild1DMipmapLevelsCore.Vinson Lee2009-12-041-0/+1
| | | | | | | | | | | | (cherry picked from commit 94bcb9f1a43f2ab3bdff09156e3ab5b1c115cbd8)
| | * glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore.Vinson Lee2009-12-041-0/+1
| | | | | | | | | | | | (cherry picked from commit 0d89f3dc7ff3f89ba8d5d664253730485bca35e2)
| | * glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore.Vinson Lee2009-12-041-0/+1
| | | | | | | | | | | | (cherry picked from commit f895abbd9777c4985aa40cf660c68f6d7333f0ec)
| | * glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore.Vinson Lee2009-12-041-0/+1
| | | | | | | | | | | | (cherry picked from commit 326b66d724754ca97012501db1c7c62d7d41a457)
| | * glu/sgi: Fix memory leak in bitmapBuild2DMipmaps.Vinson Lee2009-12-041-0/+1
| | | | | | | | | | | | (cherry picked from commit 5b925b7daa566d799c4f50911a7fcca114131503)
| | * glu/sgi: Fix memory leak in gluScaleImage3D.Vinson Lee2009-12-041-0/+2
| | | | | | | | | | | | (cherry picked from commit b611f639b4bffdcca376293f7ce71af9f6bdbff3)
| | * glu/sgi: Fix memory leak in gluScaleImage.Vinson Lee2009-12-041-0/+2
| | | | | | | | | | | | (cherry picked from commit a9c540f5dedbf593f8038fdbc95eecb60826ab26)
| | * glu: Fix memory leak in __gl_meshMakeEdge.Vinson Lee2009-12-041-1/+6
| | | | | | | | | | | | (cherry picked from commit d3b4c99c703f70a9d0e715a97e52672f7f8fc980)
| | * 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)