summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | mesa: use gcc __builtin_popcount()Brian Paul2009-11-231-0/+4
| | |
* | | Merge commit 'origin/mesa_7_7_branch'Maciej Cencora2009-11-232-7/+22
|\| |
| * | mesa: Initialize variable in _mesa_get_texel_fetch_func.Vinson Lee2009-11-231-1/+1
| | |
| * | mesa: handle different RowStride in _mesa_get_compressed_teximageRoland Scheidegger2009-11-211-6/+21
| | | | | | | | | | | | | | | | | | drivers storing compressed textures with non-native stride but relying on _mesa_get_compressed_teximage for GetCompressedTexImage otherwise won't work correctly (for instance i965 compressed mipmaps).
* | | Merge remote branch 'origin/mesa_7_7_branch'Dave Airlie2009-11-201-2/+2
|\| |
| * | AL1616: Fix cut-and-paste bugIan Romanick2009-11-171-2/+2
| | | | | | | | | | | | | | | One of the PACK_COLOR_88 cases was left over from copying _mesa_texstore_al88 to _mesa_texstore_al1616.
* | | mesa: Remove gratuitous padding in prog_dst_register.Eric Anholt2009-11-191-1/+0
| | | | | | | | | | | | | | | | | | | | | The padding was there to indicate the amount of space left from the number of expected bytes in the struct minus allocated bits. But uint bitfields get packed so that they don't cross uint boundaries, and we ended up allocating an extra dword to hold the pad field!
* | | mesa: bump version to 7.8Brian Paul2009-11-181-3/+3
|/ /
* | Merge branch 'outputswritten64'Ian Romanick2009-11-175-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a GLbitfield64 type and several macros to operate on 64-bit fields. The OutputsWritten field of gl_program is changed to use that type. This results in a fair amount of fallout in drivers that use programs. No changes are strictly necessary at this point as all bits used are below the 32-bit boundary. Fairly soon several bits will be added for clip distances written by a vertex shader. This will cause several bits used for varyings to be pushed above the 32-bit boundary. This will affect any drivers that support GLSL. At this point, only the i965 driver has been modified to support this eventuality. I did this as a "squash" merge. There were several places through the outputswritten64 branch where things were broken. I foresee this causing difficulties later for bisecting. The history is still available in the branch. Conflicts: src/mesa/drivers/dri/i965/brw_wm.h
* | ARB_fbo: Enable GL_EXT_framebuffer_multisampleIan Romanick2009-11-172-2/+7
| | | | | | | | | | | | | | | | All of this functionality is already included in ARB_fbo. This just enables the string. I was a bit lazy in using FEATURE_ARB_framebuffer_object for this feature as well. I don't think it makes much difference in the long run.
* | ARB_fbo: Regenerate files from previous commits.Ian Romanick2009-11-172-3764/+3810
| |
* | EXT_pds: Alias GL_NV_packed_depth_stencil to GL_EXT_packed_depth_stencilIan Romanick2009-11-171-0/+1
| | | | | | | | | | | | GL_EXT_packed_depth_stencil is a functional superset of GL_NV_packed_depth_stencil. If a driver enables EXT_pds, make NV_pds available as well.
* | mesa: remove old commentBrian Paul2009-11-171-1/+0
| |
* | mesa: fix incorrect type in store_texel_al1616()Brian Paul2009-11-171-1/+1
| |
* | mesa: remove trailing comment to silence warningBrian Paul2009-11-171-1/+1
| |
* | mesa: remove a bit of old codeBrian Paul2009-11-171-1/+0
| |
* | Add MESA_FORMAT_XRGB8888_REV.Michel Dänzer2009-11-175-3/+49
| |
* | Move 'static' to start of declaration to silence compiler warningIan Romanick2009-11-161-1/+1
| |
* | AL1616: Enable MESA_FORMAT_AL1616 for software pathsIan Romanick2009-11-161-2/+4
| |
* | AL1616: Add TexImage storage pathIan Romanick2009-11-161-0/+73
| |
* | AL1616: Add texel fetch / store routinesIan Romanick2009-11-162-0/+62
| |
* | AL1616: Add formats for GL_LUMINANCE16_ALPHA16 texturesIan Romanick2009-11-162-0/+27
| |
* | AL1616: Add macros to pack two GLushorts into a texelIan Romanick2009-11-161-0/+6
| |
* | mesa: remove unused vertex array driver hooksBrian Paul2009-11-162-104/+26
| |
* | mesa: check BaseLevel, MaxLevel in _mesa_GenerateMipmapEXT()Brian Paul2009-11-161-0/+5
| |
* | mesa: use _mesa_get_current_tex_object()Brian Paul2009-11-161-3/+1
| |
* | mesa: added another check in check_gen_mipmap()Brian Paul2009-11-161-1/+3
| | | | | | | | | | We don't need to call ctx->Driver.GenerateMipmap() if we're updating a texture level >= MAX_LEVEL.
* | mesa: fix some begin/end render-to-texture logicbrian2009-11-101-21/+38
| | | | | | | | | | | | | | | | | | Before, we weren't aggressive enough in checking for the start or end of render-to-texture. In particular, if only the ctx->ReadBuffer had texture attachments, we were treating that as a render-to-texture case. This fixes a regression from commit 75bdbdd90b15c8704d87ca195a364ff6a42edbb1 "intel: Don't validate in a texture image used as a render target."
* | mesa: move check_begin/end_texture_render() callsbrian2009-11-101-9/+11
| |
* | mesa: new vars: oldDrawFb, oldReadFb in _mesa_BindFramebufferEXT()brian2009-11-101-3/+7
| |
* | mesa: rename vars in _mesa_BindFramebufferEXT()brian2009-11-101-22/+21
| |
* | mesa: added comment for check_begin_texture_render()brian2009-11-101-0/+5
| |