Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Keith Whitwell | 2008-10-10 | 20 | -73/+343 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: rasterizer state depends on ST_NEW_VERTEX_PROGRAM | Brian Paul | 2008-10-09 | 1 | -1/+4 |
| | | | | | | | | Check for per-vertex point size must be done when vertex program changes. | ||||
| * | mesa: in _mesa_combine_programs() take new STATE_CURRENT_ATTRIB color into ↵ | Brian Paul | 2008-10-08 | 1 | -5/+36 |
| | | | | | | | | | | | | | | | | | | | | account Commit 1680ef869625dc1fe9cf481b180382a34e0738e7 changed the texenv program to get color from a state register instead of a constant-valued vertex attribute. This broke program concatenation (so glDraw/CopyPixels broke). Now check if the second program get's color from a constant register and handle that case appropriately. | ||||
| * | Mesa: fix the case where there are no vertex attributes. | Stephane Marchesin | 2008-10-07 | 1 | -0/+2 |
| | | | | | | | | This is a backport of 8e8208d6db8b764568539784a6473d545dec2265 to gallium-0.1 | ||||
| * | mesa: replace GLuint with GLbitfield to be clearer about usage | Brian Paul | 2008-10-07 | 7 | -20/+22 |
| | | | | | | | | Also, fix up some comments to be doxygen style. | ||||
| * | mesa: update state after binding vertex list in dlist path | Keith Whitwell | 2008-10-07 | 1 | -0/+5 |
| | | |||||
| * | mesa: protect against segfault in get_fp_input_mask() | Keith Whitwell | 2008-10-07 | 1 | -1/+4 |
| | | |||||
| * | mesa: remove old assertion | Brian Paul | 2008-10-07 | 1 | -2/+0 |
| | | |||||
| * | mesa: fix convolve/convolution mix-ups | Brian | 2008-10-06 | 3 | -5/+5 |
| | | |||||
| * | mesa: add missing GLcontext param to _mesa_delete_query(). | Brian Paul | 2008-10-06 | 2 | -2/+2 |
| | | | | | | | | Fixes vtk crash and others. | ||||
| * | mesa: handle vertex program enabled case also in texenvprogram.c | Keith Whitwell | 2008-10-04 | 1 | -5/+4 |
| | | |||||
| * | mesa: avoid generating constant vertex attributes in fixedfunc programs | Keith Whitwell | 2008-10-03 | 7 | -13/+177 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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: short-circuit case when looking up the same program twice in cache | Keith Whitwell | 2008-10-03 | 2 | -9/+22 |
| | | |||||
| * | mesa: add new internal state for tracking current vertex attribs | Keith Whitwell | 2008-10-03 | 6 | -26/+56 |
| | | |||||
| * | mesa: add missing state dependencies for various tracked constants | Keith Whitwell | 2008-10-03 | 1 | -0/+20 |
| | | |||||
| * | mesa: shrink texenvprogram state key struct | Keith Whitwell | 2008-10-03 | 1 | -5/+7 |
| | | |||||
| * | mesa: Fix compiler warnings on Windows. | Michal Krol | 2008-10-01 | 2 | -2/+2 |
| | | |||||
| * | mesa: fix temp register allocation problems. | Brian Paul | 2008-09-26 | 1 | -0/+15 |
| | | | | | | | | Complex texcombine modes were running out of registers (>32 registers for 8 tex units). | ||||
| * | gallium: rename tgsi_translate_mesa_program() to st_translate_mesa_program() | Brian Paul | 2008-09-26 | 3 | -4/+4 |
| | | |||||
| * | mesa: add some braces | Brian Paul | 2008-09-26 | 1 | -1/+2 |
| | | |||||
| * | mesa: fix/simplify initialization of vertex/fragment program limits | Brian Paul | 2008-09-25 | 2 | -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_INSTRUCTIONS | Brian Paul | 2008-09-25 | 1 | -4/+2 |
| | | |||||
| * | mesa: fix swizzle failure, fix typo | Brian Paul | 2008-09-25 | 1 | -3/+5 |
| | | |||||
| * | mesa: fix default buffer object access value | Brian Paul | 2008-09-25 | 1 | -2/+9 |
| | | |||||
* | | Mesa: fix the case where there are no vertex attributes. | Stephane Marchesin | 2008-10-06 | 1 | -0/+2 |
| | | |||||
* | | mesa: Fix compiler warnings on Windows. | Michal Krol | 2008-10-02 | 2 | -2/+2 |
| | | |||||
* | | mesa: fix temp register allocation problems. | Brian Paul | 2008-10-02 | 1 | -0/+15 |
| | | | | | | | | Complex texcombine modes were running out of registers (>32 registers for 8 tex units). | ||||
* | | cell: Fixed usage of MAX_INSTRUCTIONS to use new MAX_PROGRAM_INSTRUCTIONS ↵ | Jonathan White | 2008-09-30 | 1 | -10/+4 |
| | | | | | | | | instead of old MAX_NV_XXX definitions in order to allow Cell TGSI fragment program generator to work again. | ||||
* | | st: add prototype for st_get_framebuffer_dimensions() | Alan Hourihane | 2008-09-26 | 2 | -2/+5 |
| | | |||||
* | | st: export st_get_framebuffer_dimensions() to retrieve | Alan Hourihane | 2008-09-26 | 1 | -0/+7 |
| | | | | | | | | the width & height of the fb | ||||
* | | mesa: fix incorrect parameter order | Brian Paul | 2008-09-26 | 1 | -3/+3 |
| | | |||||
* | | mesa: remove const qualifiers to match device driver interface function | Brian Paul | 2008-09-26 | 1 | -2/+2 |
| | | |||||
* | | gallium: rename tgsi_translate_mesa_program() to st_translate_mesa_program() | Brian Paul | 2008-09-26 | 3 | -4/+4 |
| | | |||||
* | | mesa: add some braces | Brian Paul | 2008-09-26 | 1 | -1/+2 |
| | | |||||
* | | mesa: fix/simplify initialization of vertex/fragment program limits | Brian Paul | 2008-09-26 | 2 | -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_INSTRUCTIONS | Brian Paul | 2008-09-26 | 1 | -4/+2 |
| | | |||||
* | | mesa: fix swizzle failure, fix typo | Brian Paul | 2008-09-26 | 1 | -3/+5 |
| | | |||||
* | | mesa: fix default buffer object access value | Brian Paul | 2008-09-26 | 1 | -2/+9 |
| | | |||||
* | | st: change from ** to * for st_unreference_framebuffer() | Alan Hourihane | 2008-09-26 | 2 | -3/+3 |
| | | |||||
* | | mesa: fix indenting | Keith Whitwell | 2008-09-26 | 1 | -14/+14 |
| | | |||||
* | | dri: remove unused files present only on gallium-0.2 branch | Keith Whitwell | 2008-09-26 | 2 | -638/+0 |
| | | |||||
* | | Merge commit 'origin/master' into HEAD | Keith Whitwell | 2008-09-26 | 10 | -33/+53 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 code | Brian | 2008-09-25 | 2 | -5/+7 |
| | | | |||||
| * | | mesa: fix typo (s/feadback/feedback/). Fixes broken selection/feedback. | Brian Paul | 2008-09-25 | 1 | -2/+2 |
| | | | |||||
| * | | mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE) | Brian Paul | 2008-09-25 | 2 | -3/+3 |
| | | | |||||
| * | | mesa: fix some VBO buffer object issues | Brian Paul | 2008-09-25 | 2 | -11/+23 |
| | | | | | | | | | | | | | | | | | | The VBO module may use a real VBO or a malloc'd buffer for vertex storage. Be careful not to accidentally replace the later with the former when drawing. Check if using a real VBO at destroy time to prevent a double-free. | ||||
| * | | mesa: fix function params to match prototypes | Sam Hocevar | 2008-09-25 | 1 | -5/+5 |
| | | | |||||
| * | | mesa: prevent the slang code generator from aborting when faced with a ↵ | Sam Hocevar | 2008-09-25 | 1 | -1/+5 |
| | | | | | | | | | | | | sampler variable redeclaration. | ||||
| * | | i965: support for sin() and cos() in vertex shaders. | Sam Hocevar | 2008-09-25 | 1 | -0/+6 |
| | | | |||||
| * | | i965: more meaningful message for unsupported opcodes. | Sam Hocevar | 2008-09-25 | 2 | -3/+8 |
| | | |