Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-11-07 | 1 | -3/+2 |
|\ | |||||
| * | mesa: use _bfc0 instead of _col0 when building back face lighting. | Xiang, Haihao | 2008-11-07 | 1 | -3/+2 |
| | | |||||
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Brian Paul | 2008-11-05 | 1 | -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/disassembly | Brian Paul | 2008-11-01 | 2 | -30/+28 |
| | | | |||||
| * | | mesa: note that texcoords are generated by setup routines when pointsprite ↵ | Keith Whitwell | 2008-10-20 | 1 | -0/+12 |
| | | | | | | | | | | | | enabled | ||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-11-01 | 3 | -31/+29 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h | ||||
| * | | mesa: additional debug flags for glsl debug/disassembly | Brian Paul | 2008-11-01 | 2 | -30/+28 |
| | | | |||||
| * | | mesa: fix a typo in the previous commit | Xiang, Haihao | 2008-10-31 | 1 | -1/+1 |
| | | | |||||
| * | | mesa: fix an issue in _mesa_PointParameterfv(). | Xiang, Haihao | 2008-10-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-10-27 | 4 | -88/+82 |
|\| | | |||||
| * | | mesa: remove calls to _mesa_adjust_image_for_convolution(), use texImage fields | Brian Paul | 2008-10-23 | 1 | -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 Paul | 2008-10-22 | 1 | -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 checking | Brian Paul | 2008-10-22 | 1 | -33/+32 |
| | | | |||||
| * | | mesa: in textore.c, only adjust image for convolution if image is a color format | Brian Paul | 2008-10-22 | 3 | -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 17861 | Brian Paul | 2008-10-16 | 1 | -15/+6 |
| | | | |||||
* | | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Keith Whitwell | 2008-10-15 | 6 | -41/+92 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: src/mesa/main/context.c | ||||
| * | | mesa: modify fixed function vertex programs not to reference constant attributes | Keith Whitwell | 2008-10-14 | 2 | -30/+41 |
| | | | |||||
| * | | mesa: new _mesa_set_vp_override() function for driver-override of vertex program | Brian Paul | 2008-10-10 | 4 | -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.2 | Brian Paul | 2008-10-10 | 7 | -57/+34 |
|\ \ \ | | |/ | |/| | |||||
| * | | mesa: fix asst. issues in _mesa_texstore_argb8888() | Brian Paul | 2008-10-10 | 1 | -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 includes | Brian Paul | 2008-10-10 | 2 | -2/+0 |
| | | | |||||
| * | | mesa: fix error codes in _mesa_GetObjectParameterivARB(), bug 17861 | Brian Paul | 2008-10-10 | 1 | -1/+12 |
| | | | |||||
| * | | mesa: rename macro params to emphasize that there's no particular color ordering | Brian Paul | 2008-10-10 | 1 | -12/+12 |
| | | | |||||
| * | | mesa: remove unneeded includes | Brian Paul | 2008-10-10 | 2 | -2/+0 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Keith Whitwell | 2008-10-10 | 11 | -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 Anholt | 2008-10-07 | 1 | -1/+1 |
| | | | |||||
| * | | mesa: fix convolve/convolution mix-ups | Brian | 2008-10-06 | 2 | -3/+3 |
| | | | |||||
| * | | mesa: updated _mesa_delete_query() comments | Brian Paul | 2008-10-06 | 1 | -2/+1 |
| | | | |||||
| * | | mesa: add missing GLcontext param to _mesa_delete_query(). | Brian Paul | 2008-10-06 | 2 | -2/+2 |
| | | | | | | | | | | | | Fixes vtk crash and others. | ||||
| * | | Unify ARB_depth_texture and SGIX_depth_texture | Ian Romanick | 2008-10-01 | 6 | -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 query | Ian Romanick | 2008-09-29 | 1 | -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 VMS | Jouk Jansen | 2008-09-29 | 1 | -1/+31 |
| | | | |||||
| * | | mesa: drop calloc from _mesa_get_fixed_func_vertex_program | Shunichi Fuji | 2008-09-29 | 1 | -11/+7 |
| | | | | | | | | | | | | Signed-off-by: Shunichi Fuji <[email protected]> | ||||
| * | | mesa: remove invalid assertions that programs have parameters | Brian Paul | 2008-09-26 | 1 | -6/+0 |
| | | | | | | | | | | | | Fixes failure with demos/fplight.c | ||||
| * | | mesa: fix param indexing | Brad King | 2008-09-26 | 1 | -6/+6 |
| | | | |||||
* | | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Keith Whitwell | 2008-10-10 | 8 | -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 usage | Brian Paul | 2008-10-07 | 4 | -17/+19 |
| | | | | | | | | | | | | Also, fix up some comments to be doxygen style. | ||||
| * | | mesa: protect against segfault in get_fp_input_mask() | Keith Whitwell | 2008-10-07 | 1 | -1/+4 |
| | | | |||||
| * | | mesa: fix convolve/convolution mix-ups | Brian | 2008-10-06 | 2 | -3/+3 |
| | | | |||||
| * | | 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 | 4 | -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 attribs | Keith Whitwell | 2008-10-03 | 2 | -0/+5 |
| | | | |||||
| * | | mesa: shrink texenvprogram state key struct | Keith Whitwell | 2008-10-03 | 1 | -5/+7 |
| | | | |||||
| * | | 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). | ||||
| * | | 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 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). |