summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/mesa_7_7_branch'Keith Whitwell2009-12-0115-128/+203
|\ | | | | | | | | | | | | | | | | | | | | 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
| * mesa: set version string to 7.7-rc1mesa_7_7_rc1Ian Romanick2009-11-301-1/+1
| |
| * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-11-307-53/+77
| |\ | | | | | | | | | | | | | | | | | | Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
| | * i915: Actually put i915PointParameterfv in the driver function table. Duh.Ian Romanick2009-11-301-0/+1
| | |
| | * i915: Fallback bit define missed on previous commitIan Romanick2009-11-291-0/+1
| | |
| | * i915: Round point sizes instead of truncate.Ian Romanick2009-11-291-1/+1
| | |
| | * i915: Enable point sprite coordinate generationIan Romanick2009-11-291-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Improve implementation of GL_POINT_SPRITE_COORD_ORIGIN errorsIan Romanick2009-11-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | * radeon: fix context destroy needing lock for flushing.Dave Airlie2009-11-251-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
| | * i915: Initialize Length and Offset fields when mapping a buffer objectIan Romanick2009-11-231-0/+2
| | | | | | | | | | | | | | | | | | This fixes an assertion failure in _mesa_MapBufferARB. Fixes bugzilla #25253.
| | * Fix the DRI swrast driver for big endian platforms.Michel Dänzer2009-11-231-43/+29
| | | | | | | | | | | | | | | | | | Too bad I didn't realize earlier how easy this could be... Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22767 .
| | * mesa: define 32bit byteswap for AIX.Tom Fogal2009-11-191-1/+6
| | | | | | | | | | | | | | | | | | Fixes `xlib' driver build on AIX. Signed-off-by: Brian Paul <[email protected]>
| | * r600: disable compressed texture supportmesa_7_6_1_rc1Alex Deucher2009-11-181-0/+4
| | | | | | | | | | | | It's not implemented yet. fixes fdo bug 24047
| | * Revert "radeon: Fix legacy bo not to reuse dma buffers before refcount is 1."Alex Deucher2009-11-181-7/+2
| | | | | | | | | | | | | | | | | | This reverts commit 284a7af274bc148f112bd0ebb40583923ee26b49. This breaks kde desktop effects. See fdo bug 24131
| | * mesa: set version string to 7.6.1-rc1Brian Paul2009-11-181-1/+1
| | |
| * | mesa: Fix array out-of-bounds access by _mesa_TexParameterf.Vinson Lee2009-11-291-2/+7
| | | | | | | | | | | | | | | _mesa_TexParameterf calls set_tex_parameterf, which uses the params argument as an array.
| * | mesa: Fix array out-of-bounds access by _mesa_TexParameterf.Vinson Lee2009-11-291-2/+4
| | | | | | | | | | | | | | | _mesa_TexParameterf calls set_tex_parameteri, which uses the params argument as an array.
| * | radeon: update miptree code a littleMaciej Cencora2009-11-293-55/+61
| | | | | | | | | | | | | | | Simplify gl image level <-> miptree level mapping (are equal now). Don't allocate miptree for images that won't fit in it (fixes #25230).
| * | radeon: don't check the same miptree many times when looking for matching ↵Maciej Cencora2009-11-291-3/+3
| | | | | | | | | | | | miptrees
| * | radeon: add some debugging infoMaciej Cencora2009-11-292-0/+25
| | |
| * | mesa: Fix array out-of-bounds access by _mesa_TexGenf.Vinson Lee2009-11-291-1/+4
| | | | | | | | | | | | | | | _mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument as an array.
| * | mesa: Fix array out-of-bounds access by _mesa_TexGeni.Vinson Lee2009-11-281-1/+4
| | | | | | | | | | | | | | | _mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument as an array.
| * | dri: Fix potential null pointer dereference in driBindContext.Vinson Lee2009-11-281-1/+2
| | |
| * | mesa: Fix array out-of-bounds access in _mesa_TexEnvf.Vinson Lee2009-11-281-1/+4
| | | | | | | | | | | | | | | _mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument as an array.
| * | radeon: need to flush cs when moving images between mipmap treesMaciej Cencora2009-11-281-0/+4
| | |
| * | mesa: Avoid void pointer arithmetic.José Fonseca2009-11-271-1/+2
| | |
| * | radeon: fix context destroy needing lock for flushing.Dave Airlie2009-11-251-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
| * | dri: Fix potential null pointer deference in dri_put_drawable.Vinson Lee2009-11-241-4/+4
| | |
* | | mesa: Update vertex texture code after gallium changes.Michal Krol2009-12-018-5/+29
| | |
* | | st: Update for renamed sampler/texture state setters.Michal Krol2009-12-011-2/+2
| | |
* | | st/mesa: handle front/back-face +1/-1 vs. 1/0 conversionBrian Paul2009-11-301-0/+29
| | | | | | | | | | | | Fixes progs/glsl/twoside.c demo.
* | | r600 : clena up a bit for last commit.Richard Li2009-11-292-8/+6
| | |
* | | r600 : add read port allocation for uniform;Richard Li2009-11-294-62/+101
| | | | | | | | | | | | | | | mapping ps input based on vs output; fix bugs including constants updating for vs.
* | | Merge branch 'width0'Roland Scheidegger2009-11-278-50/+58
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r300/r300_texture.c src/gallium/state_trackers/xorg/xorg_exa.c src/mesa/state_tracker/st_cb_texture.c
| * | | gallium: fix more statetrackers/drivers for not using texture ↵Roland Scheidegger2009-11-261-1/+1
| | | | | | | | | | | | | | | | width/height/depth arrays
| * | | gallium: don't use arrays for texture width,height,depthKeith Whitwell2009-11-198-49/+57
| | | |
* | | | Merge commit 'origin/st-shader-varients'Roland Scheidegger2009-11-2614-651/+327
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_atom_shader.c src/mesa/state_tracker/st_program.c
| * | | | mesa/st: refactor vertex and fragment shader translationKeith Whitwell2009-11-1512-469/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate vertex shaders independently of fragment shaders. Previously tried to make fragment shader semantic indexes always start at zero and exclude holes. This was unnecessary but meant that vertex shader translation had to be adjusted to take this into account. Now use a fixed scheme for labelling special FS input semantics (color, etc), and another fixed scheme for the generics. With this, vertex shaders can be translated independently of the bound fragment shader, assuming mesa has done its own job and ensured that the vertex shader provides at least the inputs the fragment shader is looking for. The state-tracker didn't attempt to do anything about this previously, so it shouldn't be needed now.
| * | | | mesa/st: emit tgsi vertex shader directly for drawpixelsKeith Whitwell2009-11-151-77/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of several cases where we build mesa shaders and then translate them to tgsi. Many of those cases it's because we're combining two mesa programs and there are helpers for that, but in this case at least can go straight to tgsi.
| * | | | mesa/st: don't calculate unused output_flags data eitherKeith Whitwell2009-11-153-24/+4
| | | | |
| * | | | mesa/st: don't calculate unused input_flags dataKeith Whitwell2009-11-153-16/+2
| | | | |
| * | | | mesa/st: don't calculate unused vs input semantic tagsKeith Whitwell2009-11-151-69/+2
| | | | |
* | | | | r600: add ARB_texture_non_power_of_two support.Dave Airlie2009-11-252-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | | | | r600 : reset stack flag with one channel only.Richard Li2009-11-241-1/+4
| | | | |
* | | | | r600 : fix stack depth setting bug.Richard Li2009-11-241-4/+4
| | | | |
* | | | | slang: Fix allocation size.Michal Krol2009-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | We don't need 16K+ to store a single pointer.
* | | | | mesa: Fix pointer arithmetic.Michal Krol2009-11-241-1/+3
| | | | |
* | | | | r300: fix swtcl bo leak problem.Dave Airlie2009-11-241-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can get a lot of swtcl bo allocations - need to probably abstract this a bit further. Signed-off-by: Dave Airlie <[email protected]>
* | | | | radeon/r200/r300/r600: make bo mapping be explicitDave Airlie2009-11-2410-23/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | | | | mesa: use gcc __builtin_popcount()Brian Paul2009-11-231-0/+4
| | | | |