aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-071-3/+2
|\|
| * mesa: use _bfc0 instead of _col0 when building back face lighting.Xiang, Haihao2008-11-071-3/+2
| |
* | Merge commit 'origin/gallium-0.1' into gallium-0.2Brian Paul2008-11-051-0/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/rtasm/rtasm_execmem.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_log.c src/mesa/state_tracker/st_atom_framebuffer.c
| * | mesa: additional debug flags for glsl debug/disassemblyBrian Paul2008-11-012-30/+28
| | |
| * | mesa: note that texcoords are generated by setup routines when pointsprite ↵Keith Whitwell2008-10-201-0/+12
| | | | | | | | | | | | enabled
* | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-013-31/+29
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
| * | mesa: additional debug flags for glsl debug/disassemblyBrian Paul2008-11-012-30/+28
| | |
| * | mesa: fix a typo in the previous commitXiang, Haihao2008-10-311-1/+1
| | |
| * | mesa: fix an issue in _mesa_PointParameterfv().Xiang, Haihao2008-10-301-1/+1
| | |
* | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-10-274-88/+82
|\| |
| * | mesa: remove calls to _mesa_adjust_image_for_convolution(), use texImage fieldsBrian Paul2008-10-231-14/+6
| | | | | | | | | | | | The texImage->Width/Height fields will have the post-convolution width/height.
| * | mesa: move convolution image adjustment code for glCopyTexSubImage1/2/3D()Brian Paul2008-10-221-15/+21
| | | | | | | | | | | | Do it after initial error checking, after we know the texture's internal format.
| * | mesa: some re-org of glCopyTexSubImage1/2/3D() error checkingBrian Paul2008-10-221-33/+32
| | |
| * | mesa: in textore.c, only adjust image for convolution if image is a color formatBrian Paul2008-10-223-14/+20
| | | | | | | | | | | | | | | Makes things consistant with the code in teximage.c. We only want to apply convolution to color formats (not depth/index formats)
| * | mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861Brian Paul2008-10-161-15/+6
| | |
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-10-156-41/+92
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/mesa/main/context.c
| * | mesa: modify fixed function vertex programs not to reference constant attributesKeith Whitwell2008-10-142-30/+41
| | |
| * | mesa: new _mesa_set_vp_override() function for driver-override of vertex programBrian Paul2008-10-104-11/+51
| | | | | | | | | | | | | | | | | | | | | | | | Patch provide by Keith. Used in state tracker by DrawPixels to indicate that the state tracker (driver) is using its own vertex program. This prevents the texenvprogram code from replacing conventional shader inputs with state vars. Fixes glDraw/CopyPixels regressions.
* | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-10-107-57/+34
|\ \ \ | | |/ | |/|
| * | mesa: fix asst. issues in _mesa_texstore_argb8888()Brian Paul2008-10-101-40/+10
| | | | | | | | | | | | | | | | | | | | | | | | If we shift bytes into the texel word (or use the PACK_COLOR_8888 macro), we don't have to worry about big vs. little endian. See comments about texel formats in texformat.h. Remove an unneeded/incorrect else-if clause that produced wrong results on big-endian systems.
| * | mesa: remove unneeded includesBrian Paul2008-10-102-2/+0
| | |
| * | mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861Brian Paul2008-10-101-1/+12
| | |