summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-161-1/+1
|\ | | | | | | | | Conflicts: src/mesa/shader/slang/slang_compile.c
| * mesa: check frambuffer complete status before renderingAlan Hourihane2009-01-151-13/+20
| |
| * mesa: bump version to 7.3-rc2mesa_7_3_rc2Brian Paul2009-01-141-1/+1
| |
* | mesa: check frambuffer complete status before renderingAlan Hourihane2009-01-151-13/+20
| |
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-143-5/+14
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: docs/install.html docs/relnotes-7.3.html src/mesa/shader/slang/slang_codegen.c src/mesa/shader/slang/slang_compile.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_preprocess.c src/mesa/shader/slang/slang_preprocess.h
| * glsl: propagate pragma info down into compiler from preprocessorBrian Paul2009-01-141-3/+10
| |
| * mesa: fix incorrect transformation of GL_SPOT_DIRECTIONBrian Paul2009-01-141-1/+2
| | | | | | | | This was changed between GL 1.0 and 1.1. Mesa still had the 1.0 behaviour.
| * Big endian fixes.Matthieu Herrb2009-01-111-1/+2
| |
| * mesa: set version string to 7.3-rc1Brian Paul2009-01-081-1/+1
| |
| * mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.Eric Anholt2009-01-073-14/+0
| | | | | | | | | | | | | | | | There was a note in state.c about _Active deserving to die, and there were potential issues with it due to i965 forgetting to set _UseTexEnvProgram. Removing both simplifies things. Reviewed-by: Brian Paul <[email protected]>
| * mesa: Add _mesa_snprintf.José Fonseca2009-01-072-0/+15
| | | | | | | | | | | | On Windows snprintf is renamed as _snprintf. (cherry picked from commit f8f9a1b620d31d1a59855fd502caed325d4a324f)
| * mesa: fix GL_DEPTH_CLEAR_VALUE castingBrian Paul2009-01-062-4/+4
| | | | | | | | (cherry picked from commit d14d494dcda3d80ec2cf452551c680ffb432e306)
* | mesa: set version string to 7.3-rc1Brian Paul2009-01-091-1/+1
| |
* | mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.Eric Anholt2009-01-093-14/+0
| | | | | | | | | | | | | | | | There was a note in state.c about _Active deserving to die, and there were potential issues with it due to i965 forgetting to set _UseTexEnvProgram. Removing both simplifies things. Reviewed-by: Brian Paul <[email protected]>
* | mesa: Add _mesa_snprintf.José Fonseca2009-01-082-0/+15
| | | | | | | | On Windows snprintf is renamed as _snprintf.
* | mesa: fix GL_DEPTH_CLEAR_VALUE castingBrian Paul2009-01-082-4/+4
| |
* | mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)Brian Paul2009-01-081-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit 8124faf89d638285d8e9aa93adc3ca7f4ee729f3) Conflicts: src/mesa/main/get.c
* | mesa: Use explicit casts when precision is lost.José Fonseca2009-01-081-1/+1
| | | | | | | | Silences MSVC.
* | mesa: Fix windows build when UNICODE is defined.José Fonseca2009-01-081-1/+1
| |
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-065-5/+60
|\| | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_util.c
| * mesa: Fix the size per pixel for packed pixel format data type.Xiang, Haihao2009-01-063-2/+9
| |
| * mesa: Fix the number of components for GL_UNSIGNED_SHORT_1_5_5_5_REV. (bug ↵Xiang, Haihao2009-01-061-1/+1
| | | | | | | | #19390)
| * mesa: add GLushort cases for render to texture (Z-buffers)Brian Paul2009-01-051-2/+50
| |
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-0212-143/+210
|\| | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
| * mesa: comments, whitespace changesBrian Paul2009-01-011-13/+31
| |
| * mesa: increase max texture image units and GLSL samplers to 16Brian Paul2008-12-3112-131/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The max texture coord units is still 8. All the fixed-function paths are still limited to 8 too. But GLSL shaders can use more samplers now. Note that some texcoord-related data structures are declared to be 16 elements in size rather than 8. This just simplifies the code in a few places; the extra elements aren't accessible to the user. These changes haven't been extensively tested yet, but sanity checking has been done. It should be possible to increase the max image units/samplers to 32 without doing anything special. Beyond that we'll need longer bitfields in a few places.
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-301-2/+2
|\| | | | | | | | | | | Conflicts: src/mesa/main/config.h
| * mesa: increase max constants/uniforms to 256 (vec4 vectors)Brian Paul2008-12-301-2/+2
| |
* | mesa: Do not specify types in bitfields.José Fonseca2008-12-301-2/+2
| | | | | | | | As advised by gcc -pedantic.
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-192-24/+447
|\|
| * Add do_row_3d for mipmapping 3D texturesIan Romanick2008-12-191-21/+444
| | | | | | | | | | | | | | | | | | | | | | | | Previously 3D textures were mipmapped using multiple passed through the 2D mipmap generation code. This had 3 disadvantages. First, the extra passes were slow. Second, this required the allocation of a temporary buffer to hold intermediate data. Third, and most important, the extra passes caused loss of additional bits due to integer division / bit-shifting. With this change, our mipmapgen conformance test passes for non-compressed texture formats.
| * Fix typeo in mipmap filter for GL_UNSIGNED_SHORT_1_5_5_5_REVIan Romanick2008-12-191-1/+1
| |
| * mesa: Clip copytexsubimage to read framebuffer bounds, not scissor region.Eric Anholt2008-12-181-1/+1
| |
| * mesa: Correct _mesa_clip_to_region() off-by-one.Eric Anholt2008-12-181-2/+2
| | | | | | | | | | | | | | | | | | | | Note how if: x + width == xmax + 0: width -= 0 x + width == xmax + 1: width -= 0 x + width == xmax + 2: width -= 1 So, the function was clipping to [xmin, xmax+1), not [xmin, xmax) like it was supposed to. Same for ymax.
| * mesa: remove unneeded _mesa_reference_fragprog() callBrian Paul2008-12-171-4/+2
| | | | | | | | The subsequent if/else cases always call _mesa_reference_fragprog() anyway.
| * mesa: updated commentsBrian Paul2008-12-171-10/+12
| |
* | mesa: remove unneeded _mesa_reference_fragprog() callBrian Paul2008-12-181-4/+2
| | | | | | | | The subsequent if/else cases always call _mesa_reference_fragprog() anyway.
* | mesa: updated commentsBrian Paul2008-12-181-10/+12
| |
* | mesa: choose GLSL vertex shader over ARB/internal vertex program in ↵Brian Paul2008-12-171-1/+13
| | | | | | | | | | | | | | | | | | | | | | get_fp_input_mask() This is a work-around the for the fact that we do fragment shader state validation before vertex shader validation (see comments in state.c) so in get_fp_input_mask() we can't rely on ctx->VertexProgram._Current being up to date yet. This fixes a glean glsl1 test failure.
* | mesa: fix fixed-function test in get_fp_input_mask() - again.Brian Paul2008-12-171-3/+5
| | | | | | | | | | | | The problem we're solving only occured when there was a user-defined vertex shader but no fragment shader. Check for that case now. Fixes glean api2 vertex array failure.
* | mesa: add missing cases for texture array targetsBrian Paul2008-12-171-6/+10
| |
* | Revert "mesa: fix vertex program test in get_fp_input_mask()"Brian Paul2008-12-171-1/+3
| | | | | | | | | | | | This reverts commit 8dc88cb64305c591dfadded2b5acbb1e6b04cd7f. This change broke other things...
* | mesa: fix vertex program test in get_fp_input_mask()Brian Paul2008-12-171-3/+1
| | | | | | | | | | We were accidentally using the fixed-function logic when a vertex shader was being used.
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-164-72/+146
|\|
| * mesa: move _mesa_dlopen(), etc into separate dlopen.c fileBrian Paul2008-12-154-72/+146
| |
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-151-0/+12
|\|
| * Perform range checking on app supplied texture base levelIan Romanick2008-12-141-0/+12
| | | | | | | | | | | | | | | | | | It is possible for applications to specify any texture base level, including trivially invalid values (i.e., 47000000). When an app specifies an invalide base level, we should gracefully disable the texture instead of accessing memory outside the gl_texture_object. This fixes an occasional segfault in one of our conformance tests.
* | mesa: fixes for srgb, new srgb formatsRoland Scheidegger2008-12-127-54/+358
| | | | | | | | | | | | | | | | | | | | | | add some more srgb texture formats, including compressed ones various fixes relating to srgb formats issues: _mesa_get_teximage is completely broken for srgb textures, both for non-compressed ones (swizzling) and compressed ones (shouldn't do standard-to-linear conversion) texelFetch function may be broken for little or big endian (or both...)
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-091-2/+10
|\|
| * mesa: Fix GenerateMipmapEXT(GL_TEXTURE_CUBE_MAP_ARB).Eric Anholt2008-12-061-2/+10
| | | | | | | | | | | | The ctx->Driver.GenerateMipmap() hook only expects cubemap face enums, not CUBE_MAP_ARB, so walk all faces when we encounter that. Fixes oglconform fbo.c segfault with both swrast and i965 drivers.