summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | mesa: rename macro params to emphasize that there's no particular color orderingBrian Paul2008-10-101-12/+12
| | |
| * | mesa: remove unneeded includesBrian Paul2008-10-102-2/+0
| | |
* | | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-10-1011-51/+72
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
| * | mesa: Pass the context to query object delete cb to avoid null dereference.Eric Anholt2008-10-071-1/+1
| | |
| * | mesa: fix convolve/convolution mix-upsBrian2008-10-062-3/+3
| | |
| * | mesa: updated _mesa_delete_query() commentsBrian Paul2008-10-061-2/+1
| | |
| * | mesa: add missing GLcontext param to _mesa_delete_query().Brian Paul2008-10-062-2/+2
| | | | | | | | | | | | Fixes vtk crash and others.
| * | Unify ARB_depth_texture and SGIX_depth_textureIan Romanick2008-10-016-22/+16
| | | | | | | | | | | | | | | | | | | | | The ARB extension is a superset of the older SGIX extension. Any hardware that can support the SGIX version can also support the ARB version. In Mesa, any driver that supports one also supports the other. This unification just simplifies some bits of code.
| * | GLSL: Implement GL_OBJECT_TYPE_ARB queryIan Romanick2008-09-291-2/+10
| | | | | | | | | | | | | | | | | | | | | The GL_OBJECT_TYPE_ARB query is handled directly in _mesa_GetObjectParamterivARB because it is only supported in the extension version of the shanding language API. glGetProgramiv and glGetShaderiv should not accept this enum.
| * | mesa: asst updates for VMSJouk Jansen2008-09-291-1/+31
| | |
| * | mesa: drop calloc from _mesa_get_fixed_func_vertex_programShunichi Fuji2008-09-291-11/+7
| | | | | | | | | | | | Signed-off-by: Shunichi Fuji <[email protected]>
| * | mesa: remove invalid assertions that programs have parametersBrian Paul2008-09-261-6/+0
| | | | | | | | | | | | Fixes failure with demos/fplight.c
| * | mesa: fix param indexingBrad King2008-09-261-6/+6
| | |
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-10-108-22/+158
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/gallivm/instructionssoa.cpp src/gallium/auxiliary/gallivm/soabuiltins.c src/gallium/auxiliary/rtasm/rtasm_x86sse.c src/gallium/auxiliary/rtasm/rtasm_x86sse.h src/mesa/main/texenvprogram.c src/mesa/shader/arbprogparse.c src/mesa/shader/prog_statevars.c src/mesa/state_tracker/st_draw.c src/mesa/vbo/vbo_exec_draw.c
| * | mesa: replace GLuint with GLbitfield to be clearer about usageBrian Paul2008-10-074-17/+19
| | | | | | | | | | | | Also, fix up some comments to be doxygen style.
| * | mesa: protect against segfault in get_fp_input_mask()Keith Whitwell2008-10-071-1/+4
| | |
| * | mesa: fix convolve/convolution mix-upsBrian2008-10-062-3/+3
| | |
| * | mesa: add missing GLcontext param to _mesa_delete_query().Brian Paul2008-10-062-2/+2
| | | | | | | | | | | | Fixes vtk crash and others.
| * | mesa: handle vertex program enabled case also in texenvprogram.cKeith Whitwell2008-10-041-5/+4
| | |
| * | mesa: avoid generating constant vertex attributes in fixedfunc programsKeith Whitwell2008-10-034-6/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of enabled/active vertex attributes. Keep track of potential vertex program outputs. When generating fragment program, replace references to fragment attributes which are effectively non-varying and non-computed passthrough attributes with references to the new CURRENT_ATTRIB tracked state value. Only downside is slight ugliness in VBO code where we need to validate state twice in succession.
| * | mesa: add new internal state for tracking current vertex attribsKeith Whitwell2008-10-032-0/+5
| | |
| * | mesa: shrink texenvprogram state key structKeith Whitwell2008-10-031-5/+7
| | |
| * | mesa: fix temp register allocation problems.Brian Paul2008-09-261-0/+15
| | | | | | | | | | | | Complex texcombine modes were running out of registers (>32 registers for 8 tex units).
| * | mesa: fix/simplify initialization of vertex/fragment program limitsBrian Paul2008-09-252-30/+27
| | | | | | | | | | | | | | | | | | Defaults for program length, num ALU instructions, num indirections, etc. basically indicate no limit for software rendering. Driver should override as needed.
| * | mesa: increase MAX_INSTRUCTIONSBrian Paul2008-09-251-4/+2
| | |
| * | mesa: fix swizzle failure, fix typoBrian Paul2008-09-251-3/+5
| | |
| * | mesa: fix default buffer object access valueBrian Paul2008-09-251-2/+9
| | |
* | | mesa: fix temp register allocation problems.Brian Paul2008-10-021-0/+15
| | | | | | | | | | | | Complex texcombine modes were running out of registers (>32 registers for 8 tex units).