summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* mesa: minor reformatting/rewrapping in dd.hBrian Paul2009-12-111-6/+7
|
* mesa: remove unused ctx->Driver.ActiveTexture() hookBrian Paul2009-12-111-5/+0
|
* mesa: updated commentBrian Paul2009-12-111-1/+1
|
* Merge branch 'mesa_7_7_branch'Brian Paul2009-12-1112-37/+98
|\ | | | | | | | | | | Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
| * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-116-20/+55
| |\
| | * mesa: Fix array out-of-bounds access by _mesa_TexParameteriv.Vinson Lee2009-12-101-2/+4
| | |
| | * mesa: Fix array out-of-bounds access by _mesa_TexGend.Vinson Lee2009-12-091-2/+4
| | | | | | | | | | | | | | | _mesa_TexGend calls _mesa_TexGenfv, which uses the params argument as an array.
| | * mesa: Fix array out-of-bounds access by _mesa_Lighti.Vinson Lee2009-12-091-1/+4
| | | | | | | | | | | | | | | _mesa_Lighti calls _mesa_Lightiv, which uses the params argument as an array.
| | * mesa: Fix array out-of-bounds access by _mesa_Lightf.Vinson Lee2009-12-091-1/+4
| | |
| | * mesa: Fix array out-of-bounds access by _mesa_PointParameteri.Vinson Lee2009-12-091-2/+4
| | | | | | | | | | | | | | | _mesa_PointParameteri calls _mesa_PointParameterfv, which uses the params argument as an array.
| | * mesa: Fix array out-of-bounds access by _mesa_PointParameterf.Vinson Lee2009-12-091-1/+4
| | | | | | | | | | | | | | | _mesa_PointParameterf calls _mesa_PointParameterfv, which uses the params argument as an array.
| | * mesa: Fix array out-of-bounds access by _mesa_LightModelf.Vinson Lee2009-12-091-1/+4
| | | | | | | | | | | | | | | _mesa_LightModelf calls _mesa_LightModelfv, which uses the params argument as an array.
| | * mesa: fix baseLevel >= MAX_TEXTURE_LEVELS testBrian Paul2009-12-091-1/+1
| | | | | | | | | | | | | | | This fixes invalid array indexing when baseLevel == MAX_TEXTURE_LEVELS. See bug 25528.
| | * mesa: Fix array out-of-bounds access by _mesa_LightModeli.Vinson Lee2009-12-081-1/+4
| | | | | | | | | | | | | | | _mesa_LightModeli calls _mesa_LightModeliv, which uses the params argument as an array.
| | * mesa: Fix array out-of-bounds access by _mesa_Fogf.Vinson Lee2009-12-081-1/+4
| | | | | | | | | | | | | | | _mesa_Fogf calls _mesa_Fogfv, which uses the params argument as an array.
| | * mesa: Fix array out-of-bounds access by _mesa_TexParameteri.Vinson Lee2009-12-081-1/+6
| | | | | | | | | | | | | | | _mesa_TexParameteri calls set_tex_parameteri, which uses the params argument as an array.
| | * mesa: Fix array out-of-bounds access by _mesa_Fogi.Vinson Lee2009-12-081-2/+4
| | | | | | | | | | | | | | | _mesa_Fogi calls _mesa_Fogfv, which uses the params argument as an array.
| | * mesa: Fix array out-of-bounds access by _mesa_TexParameteri.Vinson Lee2009-12-081-2/+4
| | | | | | | | | | | | | | | _mesa_TexParameteri calls set_tex_parameterf, which uses the params argument as an array.
| | * mesa: Fix array out-of-bounds access by _mesa_TexParameterfv.Vinson Lee2009-12-081-2/+4
| | | | | | | | | | | | | | | _mesa_TexParameterfv calls set_tex_parameteri, which uses the params argument as an array.
| | * mesa: set version string to 7.6.1-rc3mesa_7_6_1_rc3Ian Romanick2009-12-071-1/+1
| | |
| | * 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)
| | * 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)
| | * mesa: set version string to 7.6.1-rc2mesa_7_6_1_rc2Ian Romanick2009-11-301-1/+1
| | |
| * | mesa: Move OES_read_format support from drivers into the core.Eric Anholt2009-12-096-17/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assertion is that the correct read type to be using is the native type of the underlying read renderbuffer. For some fallback paths, this may be worse than GL_RGBA/GL_UNSIGNED_BYTE for reads today, but it gets all drivers the expected GL_BGRA/GL_UNSIGNED_BYTE for ARGB8888 or GL_BGR//GL_UNSIGNED_SHORT_5_6_5_REV for rgb565 with no work. This fixes the intel (and other) DRI drivers to report read formats that should hit blit PBO readpixels paths.
| * | mesa: set version string to 7.7-rc1mesa_7_7_rc2Ian Romanick2009-12-071-1/+1
| | | | | | | | | | | | Also modify the Makefile to use the correct version for the tarballs.
* | | mesa: Fix default (swrast) GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS.Eric Anholt2009-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The swrast pipeline shouldn't have any problem with all the frag and vert textures being bound at the same time. Note that this may result in DRI drivers that don't set this limit having an improbable return (fragment + vertex < combined), but it seems like it shouldn't cause problems for apps.
* | | Merge branch 'gallium-strict-aliasing'Roland Scheidegger2009-12-082-16/+12
|\ \ \
| * | | mesa: fix strict aliasing issues in half-to-float/float-to-half conversionsRoland Scheidegger2009-12-071-8/+9
| | | | | | | | | | | | | | | | use union instead of casts
| * | | mesa: use _mesa_memcpy for COPY_4FV macroRoland Scheidegger2009-12-031-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Gets rid of one of the worst strict-aliasing offenders, and actually produces faster code (at least in some cases, when compiler can use for instance 64bit moves for memcpy). (note _mesa_memcpy should get inlined)
* | | | Merge branch 'mesa_7_7_branch'Jakob Bornecrantz2009-12-022-9/+13
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | mesa: Fix bad conversion in AL1616_REV texstore.Eric Anholt2009-12-021-8/+12
| | |
| * | mesa: Fix copy'n'paste problem in al1616 texel fetch.Eric Anholt2009-12-021-1/+1
| | |
* | | mesa: added comment for target_enum_to_index()Brian Paul2009-12-011-1/+2
| | |
* | | Merge commit 'origin/mesa_7_7_branch'Keith Whitwell2009-12-015-9/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-2/+12
| |\| | | | | | | | | | | | | | | | | | | Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
| | * 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).
| | * 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]>
| | * 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.
| * | 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.
| * | 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.
| * | mesa: Avoid void pointer arithmetic.José Fonseca2009-11-271-1/+2
| | |
* | | mesa: Update vertex texture code after gallium changes.Michal Krol2009-12-014-5/+7
| | |
* | | mesa: Fix pointer arithmetic.Michal Krol2009-11-241-1/+3
| | |