summaryrefslogtreecommitdiff
path: root/src/mesa
AgeCommit message (Collapse)Author
2009-12-08Merge branch 'mesa_7_6_branch' into mesa_7_7_branchAndre Maasikas
2009-12-08r600: add support for TXB instructionAndre Maasikas
makes testing other things easier - does not hang the card TODO: enable TEX dependency tracking in vertex programs
2009-12-08r600: reorder state for render_target and blendAndre Maasikas
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
2009-12-07mesa: set version string to 7.7-rc1Ian Romanick
Also modify the Makefile to use the correct version for the tarballs.
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-07Revert "intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system ↵Ian Romanick
buffers." This reverts commit 4598942b1b88a2a7d5af7febae7e79eedf00e385. XRGB8888 doesn't work as intended. Revert this for now, and we'll revisit it for 7.8 or something.
2009-12-07mesa: set version string to 7.6.1-rc3Ian Romanick
2009-12-07radeon: fix cases when only first image where put directly into miptree.Maciej Cencora
Make sure that minimal width, height and depth of texture image is 1.
2009-12-07radeon: fix image migration for small compressed texturesMaciej Cencora
memcpy would give incorrect results if src rowstride != dst rowstride
2009-12-06dri: Fix potential null pointer dereference in driBindContext.Vinson Lee
(cherry picked from commit 919898e92fa23ff71a59d86a46ff0886a6f34e4d)
2009-12-06dri: Fix potential null pointer deference in dri_put_drawable.Vinson Lee
(cherry picked from commit 364070b1f2b08d43fb205ec198894a35bec6b2f3)
2009-12-05mesa: Fix array out-of-bounds access by _mesa_TexGenf.Vinson Lee
_mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument as an array. (cherry picked from commit ca5a7aadb4361e7d053aea8687372cd44cbd8795)
2009-12-05mesa: Fix array out-of-bounds access by _mesa_TexGeni.Vinson Lee
_mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument as an array. (cherry picked from commit d55fb7c835b56951f05a058083e7eda264ba192e)
2009-12-05mesa: Fix array out-of-bounds access by _mesa_TexParameterf.Vinson Lee
_mesa_TexParameterf calls set_tex_parameterf, which uses the params argument as an array. (cherry picked from commit 270d36da146b899d39e08f830fe34b63833a3731)
2009-12-05mesa: Fix array out-of-bounds access by _mesa_TexParameterf.Vinson Lee
_mesa_TexParameterf calls set_tex_parameteri, which uses the params argument as an array. (cherry picked from commit a201dfb6bf28b89d6f511c2ec9ae0d81ef18511d)
2009-12-04mesa: Fix array out-of-bounds access in _mesa_TexEnvf.Vinson Lee
_mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument as an array. (cherry picked from commit a11d60d14caf8efc07f70af63b57b33273f8cf9b)
2009-12-04radeon: fix polygon stippleAlex Deucher
fixes fdo bug 25354 Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-12-03radeon: workaround an FBO issueMaciej Cencora
Fixes #21501
2009-12-03radeon: properly check if image should be placed in the miptreeMaciej Cencora
Fixes #25355
2009-12-03r200: fix polygon stippleAlex Deucher
fixes fdo bug 25354 Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-12-02Merge commit 'mesa_7_6_branch' into mesa_7_7_branchJakob Bornecrantz
Conflicts: src/mesa/main/version.h
2009-12-02intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system buffers.Eric Anholt
2009-12-02mesa: Fix bad conversion in AL1616_REV texstore.Eric Anholt
2009-12-02mesa: Fix copy'n'paste problem in al1616 texel fetch.Eric Anholt
2009-12-01intel: Remove GL_NV_point_sprite from extension listIan Romanick
i830 does not (and cannot!) support the any of the non-default GL_POINT_SPRITE_R_MODE_NV settings. i915 and i965 could, but currently do not. In both cases it would require mucking about with the fragment shader.
2009-12-02intel: Fix more front-buffer rendering after Brian's less flushing patch.Eric Anholt
bcbfda71b03303d3f008a6f3cf8cb7d9667bf8d2 left out many blit paths. This fixes up more of them to get Blender to work again. Bug #25030.
2009-12-02Revert "radeon/r300: no need to flush the cmdbuf when changing scissors ↵Dave Airlie
state in KMM mode" This reverts commit 286bf89e5a1fc931dbf523ded861b809859485e2. This doesn't appear to be correct, regression so revert it. http://bugs.freedesktop.org/show_bug.cgi?id=25193
2009-12-01vbo: make flush recursion check code per-contextBrian Paul
This fixes invalid failed assertions when running multi-threaded apps.
2009-12-01st/mesa: updated emit_swz() commentBrian Paul
2009-11-30mesa: set version string to 7.7-rc1Ian Romanick
2009-11-30mesa: set version string to 7.6.1-rc2Ian Romanick
2009-11-30Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick
Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
2009-11-30i915: Actually put i915PointParameterfv in the driver function table. Duh.Ian Romanick
2009-11-29mesa: Fix array out-of-bounds access by _mesa_TexParameterf.Vinson Lee
_mesa_TexParameterf calls set_tex_parameterf, which uses the params argument as an array.
2009-11-29i915: Fallback bit define missed on previous commitIan Romanick
2009-11-29i915: Round point sizes instead of truncate.Ian Romanick
2009-11-29i915: Enable point sprite coordinate generationIan Romanick
Support still isn't completely correct, but it's better. piglit point-sprite now passes. However, glean's pointSprite test fails. In that test the texture on the sprite is somehow inverted as though GL_POINT_SPRITE_COORD_ORIGIN were set to GL_LOWER_LEFT. i915 hardware shouldn't be able to do that! I believe there are also problems when not all texture units have GL_COORD_REPLACE set. The hardware enable seems to be all or nothing. Fixes bug #25313.
2009-11-29mesa: Fix array out-of-bounds access by _mesa_TexParameterf.Vinson Lee
_mesa_TexParameterf calls set_tex_parameteri, which uses the params argument as an array.
2009-11-29radeon: update miptree code a littleMaciej Cencora
Simplify gl image level <-> miptree level mapping (are equal now). Don't allocate miptree for images that won't fit in it (fixes #25230).
2009-11-29radeon: don't check the same miptree many times when looking for matching ↵Maciej Cencora
miptrees
2009-11-29radeon: add some debugging infoMaciej Cencora
2009-11-29mesa: Fix array out-of-bounds access by _mesa_TexGenf.Vinson Lee
_mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument as an array.
2009-11-28mesa: Fix array out-of-bounds access by _mesa_TexGeni.Vinson Lee
_mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument as an array.
2009-11-28dri: Fix potential null pointer dereference in driBindContext.Vinson Lee
2009-11-28mesa: Fix array out-of-bounds access in _mesa_TexEnvf.Vinson Lee
_mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument as an array.
2009-11-28radeon: need to flush cs when moving images between mipmap treesMaciej Cencora
2009-11-27mesa: Avoid void pointer arithmetic.José Fonseca
2009-11-25Improve implementation of GL_POINT_SPRITE_COORD_ORIGIN errorsIan Romanick
This enum is only supported for OpenGL 2.0. If a driver supports OpenGL 1.4 and GL_ARB_point_sprite, using this enum should generate an error. This is important because, for example, i915 and i830 can support GL_ARB_point_sprite, but they cannot support GL_POINT_SPRITE_COORD_ORIGIN. This commit just removes the check for NV_point_sprite, which is completely wrong, and add some comments describing what the code should do. I don't see an easy way to check for version >= 2.0 from inside Mesa. Perhaps we should add an extension GL_MESA_point_sprite_20 (like Intel's old GL_EXT_packed_pixels_12) to indicate that this added bit of functionality is available. Also note that glean's pointSprite test only checks for GL_ARB_point_sprite before trying to use GL_POINT_SPRITE_COORD_ORIGIN. Naturally, that fails on non-2.0 implementations (i.e., Mac OS X on GMA 950).
2009-11-25radeon: fix context destroy needing lock for flushing.Dave Airlie
Thanks to Intel code which I've just stolen pretty much as usual. This fixes fdo bug 22851 which is a dri1 regression since rewrite. Tested by: fpiobaf (Fabio) on #radeon Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-11-25radeon: fix context destroy needing lock for flushing.Dave Airlie
Thanks to Intel code which I've just stolen pretty much as usual. This fixes fdo bug 22851 which is a dri1 regression since rewrite. Tested by: fpiobaf (Fabio) on #radeon Signed-off-by: Dave Airlie <airlied@redhat.com>