summaryrefslogtreecommitdiff
path: root/src/mesa
AgeCommit message (Collapse)Author
2009-12-02Merge branch 'mesa_7_7_branch'Jakob Bornecrantz
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-01mesa: added comment for target_enum_to_index()Brian Paul
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-12-01Merge commit 'origin/mesa_7_7_branch'Keith Whitwell
Conflicts: src/gallium/drivers/svga/svga_screen_texture.c src/gallium/state_trackers/xorg/xorg_composite.c src/gallium/state_trackers/xorg/xorg_exa.c src/gallium/state_trackers/xorg/xorg_renderer.c src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/main/texgetimage.c src/mesa/main/version.h
2009-12-01mesa: Update vertex texture code after gallium changes.Michal Krol
2009-12-01st: Update for renamed sampler/texture state setters.Michal Krol
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-30gallium: interface cleanups, remove nblocksx/y from pipe_texture and moreRoland Scheidegger
This patch removes nblocksx, nblocksy arrays from pipe_texture (can be recalculated if needed). Furthermore, pipe_format_block struct is gone completely (again, contains just derived state). nblocksx, nblocksy, block are also removed from pipe_transfer, together with the format enum (can be obtained from the texture associated with the transfer).
2009-11-30st/mesa: handle front/back-face +1/-1 vs. 1/0 conversionBrian Paul
Fixes progs/glsl/twoside.c demo.
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-29r600 : clena up a bit for last commit.Richard Li
2009-11-29r600 : add read port allocation for uniform;Richard Li
mapping ps input based on vs output; fix bugs including constants updating for vs.
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-27Merge branch 'width0'Roland Scheidegger
Conflicts: src/gallium/drivers/r300/r300_texture.c src/gallium/state_trackers/xorg/xorg_exa.c src/mesa/state_tracker/st_cb_texture.c
2009-11-26gallium: fix more statetrackers/drivers for not using texture ↵Roland Scheidegger
width/height/depth arrays
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-26Merge commit 'origin/st-shader-varients'Roland Scheidegger
Conflicts: src/mesa/state_tracker/st_atom_shader.c src/mesa/state_tracker/st_program.c
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-25r600: add ARB_texture_non_power_of_two support.Dave Airlie
This makes the miptree rounds up to the near POT for each level for all radeons, however since mipmaps aren't support with NPOT on previous radeons this calculation shouldn't cause any problems. If it does we can just make it r600 only. I tested a few mipmap demos on r500 and they all seem to work. Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-11-24r600 : reset stack flag with one channel only.Richard Li
2009-11-24r600 : fix stack depth setting bug.Richard Li
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-24slang: Fix allocation size.Michal Krol
We don't need 16K+ to store a single pointer.
2009-11-24mesa: Fix pointer arithmetic.Michal Krol
2009-11-23i915: Initialize Length and Offset fields when mapping a buffer objectIan Romanick
This fixes an assertion failure in _mesa_MapBufferARB. Fixes bugzilla #25253.
2009-11-24r300: fix swtcl bo leak problem.Dave Airlie
We can get a lot of swtcl bo allocations - need to probably abstract this a bit further. Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-11-24radeon/r200/r300/r600: make bo mapping be explicitDave Airlie
This moves the bo mapping outside the DMA layer and makes it explicit, this should in theory make it simpler to split the clean up the dma/cmdbuf linkage that I created before that is broken. Tested on: r600, rv380 (tcl/no-tcl), rv200 (tcl/no-tcl) Signed-off-by: Dave Airlie <airlied@redhat.com>