summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* 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).
* | | mesa: fix/simplify initialization of vertex/fragment program limitsBrian Paul2008-09-262-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-261-4/+2
| | |
* | | mesa: fix swizzle failure, fix typoBrian Paul2008-09-261-3/+5
| | |
* | | mesa: fix default buffer object access valueBrian Paul2008-09-261-2/+9
| | |
* | | mesa: fix indentingKeith Whitwell2008-09-261-14/+14
| | |
* | | Merge commit 'origin/master' into HEADKeith Whitwell2008-09-263-10/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/mesa/vbo/vbo.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_exec_draw.c
| * | mesa: fix cast/conversion for optional codeBrian2008-09-252-5/+7
| | |
| * | mesa: fix typo (s/feadback/feedback/). Fixes broken selection/feedback.Brian Paul2008-09-251-2/+2
| | |
| * | mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)Brian Paul2008-09-252-3/+3
| | |
| * | set SamplerUnit[] entry in load_texture() just to be safeBrian2008-09-241-0/+4
| | | | | | | | | | | | (cherry picked from commit fce4612f8a29ee1798c9326a431a139d856c7a04)
| * | use PROGRAM_CONSTANT instead of PROGRAM_STATE_VAR when generating ↵Brian2008-09-241-1/+1
| | | | | | | | | | | | | | | | | | immediates/literals (cherry picked from commit fdc8636bdc65deb0d95a62a51c8d9bca05bc6bb8)
| * | set program->SamplersUsed bit when using a texture instructionBrian2008-09-241-1/+4
| | |
| * | Remove ctx field from texenvprog_cacheBrian2008-09-241-4/+4
| | |
| * | include programopt.hBrian2008-09-241-0/+1
| | | | | | | | | | | | (cherry picked from commit 83fad68ec1989c719646a76f4cc5e0b3d23537ed)
| * | Disable vertex shader fog, compute fog in fragment shader.Brian2008-09-241-5/+11
| | |
| * | temporarily set the FRAG_BIT_FOGC bit in InputsRead when fog is enabledBrian2008-09-241-0/+1
| | | | | | | | | | | | (cherry picked from commit 63be96bdc7e9f388a5c49295bd7e150462fd003a)
* | | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-231-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/drawpix.c src/mesa/shader/prog_uniform.c src/mesa/shader/slang/slang_link.c
| * | mesa: Apply MSVC portability fixes from Alan Hourihane.José Fonseca2008-09-2311-59/+17
| | |
| * | mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵Brian Paul2008-09-231-1/+4
| | | | | | | | | | | | | | | | | | point coord (cherry picked from commit d7a7b0a10dd355fbeb7a404091a42d4ab558c820)
| * | Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in ↵Brian2008-09-233-7/+60
| | | | | | | | | | | | | | | | | | | | | the drivers. This should probably be pulled into main-line Mesa... (cherry picked from commit 324ecadbfdf9b944e059832f146451e4151dcb21)
| * | Remove incorrect test from mmAllocMem.Michel Dänzer2008-09-221-1/+1
| | | | | | | | | | | | | | | 0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was broken by this.
* | | remove leftover merge conflict markersKeith Whitwell2008-09-231-4/+0
| | |
* | | Remove incorrect test from mmAllocMem.Michel Dänzer2008-09-221-1/+1
| | | | | | | | | | | | | | | 0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was broken by this.
* | | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-2112-85/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/glapi.h src/mesa/main/api_exec.c src/mesa/main/attrib.c src/mesa/main/clear.c src/mesa/main/context.c src/mesa/main/mfeatures.h src/mesa/main/mipmap.c src/mesa/main/mipmap.h src/mesa/main/readpix.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texformat.c src/mesa/main/texparam.c src/mesa/main/texstate.c src/mesa/vbo/vbo_context.c src/mesa/x86/common_x86_asm.S
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 12:55:27 +0000