summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-10-1011-51/+72
|\
| * 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
| * Unify ARB_depth_texture and SGIX_depth_textureIan Romanick2008-10-016-22/+16
| * GLSL: Implement GL_OBJECT_TYPE_ARB queryIan Romanick2008-09-291-2/+10
| * 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
| * mesa: remove invalid assertions that programs have parametersBrian Paul2008-09-261-6/+0
| * mesa: fix param indexingBrad King2008-09-261-6/+6
* | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-10-108-22/+158
|\ \
| * | mesa: replace GLuint with GLbitfield to be clearer about usageBrian Paul2008-10-074-17/+19
| * | 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
| * | 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
| * | 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
| * | mesa: fix/simplify initialization of vertex/fragment program limitsBrian Paul2008-09-252-30/+27
| * | 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
* | | mesa: fix/simplify initialization of vertex/fragment program limitsBrian Paul2008-09-262-30/+27
* | | 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
|\ \ \ | | |/ | |/|
| * | 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
| * | use PROGRAM_CONSTANT instead of PROGRAM_STATE_VAR when generating immediates/...Brian2008-09-241-1/+1
| * | 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
| * | 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
* | | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-231-2/+2
|\| |
| * | 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, poi...Brian Paul2008-09-231-1/+4
| * | Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in ...Brian2008-09-233-7/+60
| * | Remove incorrect test from mmAllocMem.Michel Dänzer2008-09-221-1/+1
* | | remove leftover merge conflict markersKeith Whitwell2008-09-231-4/+0
* | | Remove incorrect test from mmAllocMem.Michel Dänzer2008-09-221-1/+1
* | | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-2112-85/+84
|\| |