summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-083-8/+11
|\| | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * mesa: fix conditional in save_Lightfv(), bug 18838Brian2008-12-011-1/+1
| |
| * mesa: enable texture compression extensions for software drivers when possibleBrian Paul2008-11-281-1/+10
| |
| * mesa: remove unneeded compressed texure size checksPhillip Klaus Krause2008-11-281-6/+0
| |
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-242-0/+5
|\| | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * mesa: add gl_program::Input/OutputFlags[] arrayBrian Paul2008-11-242-0/+5
| | | | | | | | | | These arrays will indicate per-input or per-output options for vertex/fragment programs such as centroid-sampling and invariance.
* | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-203-3/+16
|\|
| * mesa: fix shadow sampling unit issue.Xiang, Haihao2008-11-201-1/+6
| | | | | | | | | | texture comparison logic is bypassed if the currently bound texture is not a depth/depth_stencil texture.
| * mesa: clamp luminance if needed.Xiang, Haihao2008-11-192-2/+10
| | | | | | | | | | This fixes glReadPixels(GL_LUMINANCE, GL_FLOAT)/glGetTexImage(GL_LUMINANCE, GL_FLOAT) issue on fixed-point color buffers.
| * mesa: fix generation of fixed function state when no vp existsAlan Hourihane2008-11-131-43/+41
| |
* | mesa: fix generation of fixed function state when no vp existsAlan Hourihane2008-11-131-43/+41
| |
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-118-30/+52
|\| | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
| * mesa: restore the negate flag of dots in build_lighting.Xiang, Haihao2008-11-111-0/+3
| | | | | | | | | | Dots is re-used if more than one light is enabled. Previously the negate flag of dots may affect next light.
| * mesa: update new state for RasterPos like other operations.Xiang, Haihao2008-11-111-3/+3
| | | | | | | | This fixes a lighting issue when drawing a bitmap.
| * mesa: new _mesa_is_pow_two() functionBrian2008-11-105-23/+33
| |
| * mesa: fix some misc breakage caused by editing auto-generated files rather ↵Brian Paul2008-11-101-4/+8
| | | | | | | | | | | | | | | | than the python generators Specifically: #include "glapitable.h" in src/mesa/main/glapi/dispatch.h Call _mesa_bsearch() in src/mesa/main/enums.c.
| * GLX: fix out-of-bounds memory issue in indirect glAreTexturesResident()Brian Paul2008-11-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug 18445. When getting array results, __glXReadReply() always reads a multiple of four bytes. This can cause writing to invalid memory when 'n' is not a multiple of four. Special-case the glAreTexturesResident() functions now. To fix the bug, we use a temporary buffer that's a multiple of four bytes in length. NOTE: this commit also reverts part of commit 919ec22ecf72aa163e1b97d8c7381002131ed32c (glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protection) which directly edited the indirect.c file rather than the python generator! I'm not repairing that issue at this time.
| * mesa: use NRM3 in emit_normalize_vec3() when drivers are readyBrian2008-11-081-0/+5
| |