Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into glsl-pp-rework-2 | Michal Krol | 2009-09-17 | 44 | -1924/+2641 |
|\ | | | | | | | | | Conflicts: src/gallium/winsys/gdi/SConscript | ||||
| * | mesa: begin some texstore code refactoring | Brian Paul | 2009-09-16 | 1 | -28/+25 |
| | | | | | | | | | | Next step will be to move the calls to ctx->Driver.ChooseTextureFormat() into the teximage.c functions so drivers don't have to do it. | ||||
| * | mesa: meta driver functions for glCopyTex[Sub]Image() | Brian Paul | 2009-09-16 | 2 | -23/+335 |
| | | | | | | | | | | Implement in terms of glReadPixels + glTex[Sub]Image(). This will allow us to get rid of some swrast texture code. | ||||
| * | swrast: remove mipmap generation checks (done in core Mesa now) | Brian Paul | 2009-09-16 | 1 | -25/+0 |
| | | |||||
| * | s3v: remove unneeded initializations | Brian Paul | 2009-09-16 | 1 | -11/+0 |
| | | |||||
| * | ffb: remove disabled code | Brian Paul | 2009-09-16 | 1 | -18/+0 |
| | | |||||
| * | Merge branch 'mesa_7_6_branch' | Ian Romanick | 2009-09-16 | 3 | -0/+668 |
| |\ | |||||
| | * | Merge branch 'mesa_7_5_branch' into mesa_7_6_branch | Ian Romanick | 2009-09-16 | 2 | -0/+667 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/dlist.c | ||||
| | | * | intel: Deassociated drawables from private context struct in intelUnbindContext | Ian Romanick | 2009-09-16 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generic DRI infrastructure makes sure that __DRIcontextRec::driDrawablePriv and __DRIcontextRec::driReadablePriv are set to NULL after unbinding a context. However, the intel_context structure keeps cached copies of these pointers. If these cached pointers are not NULLed and the drawable is actually destroyed after unbinding the context (typically by way of glXDestroyWindow), freed memory will be dereferenced in intelDestroyContext. This should fix bug #23418. | ||||
| | | * | mesa: compile glUniformMatrix() functions into display lists | Brian Paul | 2009-09-15 | 1 | -0/+242 |
| | | | | | | | | | | | | | | | | | | | | I believe this is the last of the shader-related functions that needed display list treatment. | ||||
| | | * | mesa: implement more glUniform display list functions | Brian Paul | 2009-09-15 | 1 | -1/+365 |
| | | | | |||||
| | | * | mesa: compile glUniform4f() into display lists | Brian Paul | 2009-09-15 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | Note: there are more glUniform functions to compile... | ||||
| | | * | mesa: compile glUseProgram/glUseProgramObjectARB into display lists | Brian Paul | 2009-09-15 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | Fixes bug 23746 | ||||
| | * | | i965: do a flush in clear, fix openarena render issue, | Zou Nan hai | 2009-09-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | fd.o bug# 23857 | ||||
| * | | | radeon: cleanup compile defines mess. | Dave Airlie | 2009-09-16 | 9 | -88/+67 |
| | | | | | | | | | | | | | | | | | | | | I inherited this and really it stayed around far too long, make it nice and simple. | ||||
| * | | | radeon: oops remove debugging left on in previous patch | Dave Airlie | 2009-09-16 | 1 | -2/+0 |
| | | | | |||||
| * | | | radeon: use txformat to decide to emit rect tex state. | Dave Airlie | 2009-09-16 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | This is more logical, and fixes a TFP issue. | ||||
| * | | | mesa: move generate mipmap calls | Brian Paul | 2009-09-15 | 10 | -177/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | Per the suggestion in the Intel driver, move the calls to ctx->Driver.GenerateMipmap() into core Mesa so that drivers don't have to worry about it. | ||||
| * | | | mesa: minor clean-up | Brian Paul | 2009-09-15 | 1 | -3/+3 |
| | | | | |||||
| * | | | mesa: remove last of gotos | Brian Paul | 2009-09-15 | 1 | -62/+62 |
| | | | | |||||
| * | | | mesa: more goto removal | Brian Paul | 2009-09-15 | 1 | -142/+129 |
| | | | | |||||
| * | | | mesa: remove some gotos | Brian Paul | 2009-09-15 | 1 | -105/+96 |
| | | | | | | | | | | | | | | | | This will make some subsequent changes easier... | ||||
| * | | | mesa: clean-up fbo debug code | Brian Paul | 2009-09-15 | 1 | -16/+23 |
| | | | | |||||
| * | | | mesa: added GL_ARB_provoking_vertex (same as EXT version) | Brian Paul | 2009-09-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | radeon: don't build non-r600 span code on r600 | Alex Deucher | 2009-09-15 | 1 | -1/+5 |
| | | | | |||||
| * | | | r600: minor span cleanups | Alex Deucher | 2009-09-15 | 1 | -4/+3 |
| | | | | |||||
| * | | | mesa: remove incorrect texture state check | Brian Paul | 2009-09-15 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes incorrectly textured bitmap text in engine demo. It's incorrect to test the texture enable bits here since they may have been changed by disabling the shader above. Optimization is still possible but will have to be reexamined. | ||||
| * | | | st/mesa: disable accidentally committed _mesa_print_program() call | Brian Paul | 2009-09-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-09-15 | 4 | -4/+47 |
| |\| | | |||||
| | * | | Merge branch 'mesa_7_5_branch' into mesa_7_6_branch | Brian Paul | 2009-09-15 | 3 | -3/+46 |
| | |\| | |||||
| | | * | glsl: added some link debug code (disabled) | Brian Paul | 2009-09-14 | 1 | -0/+15 |
| | | | | |||||
| | | * | glsl: remove extra #version directives from concatenated shader sources | Brian Paul | 2009-09-14 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we concatenate shaders to do our form of poor-man linking, if there's multiple #version directives, preprocessing fails. This change disables the extra #version directives by changing the first two chars to //. This should help with some Wine issues such as bug 23946. | ||||
| | | * | mesa: raise GL_INVALID_ENUM not GL_INVALID_VALUE for glTexParamter errors | Vinson Lee | 2009-09-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> | ||||
| | * | | radeon: Remove structure allocation from iterator variable. | Pauli Nieminen | 2009-09-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | dma_bo varaible is only used for iterating so allocating memory for it only causes memory leaks. | ||||
| * | | | ARB prog parser: regenerated file | Brian Paul | 2009-09-15 | 1 | -193/+197 |
| | | | | |||||
| * | | | ARB prog parser: more detailed error message for out of bounds ADDR offsets | Brian Paul | 2009-09-15 | 1 | -4/+8 |
| | | | | |||||
| * | | | r600: support position_invariant programs | Andre Maasikas | 2009-09-15 | 1 | -12/+18 |
| | | | | |||||
| * | | | r600: add span support for 1D tiles | Alex Deucher | 2009-09-14 | 3 | -1/+223 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1D tile span support for depth/stencil/color/textures Z and stencil buffers are always tiled, so this fixes sw access to Z and stencil buffers. color and textures are currently linear, but this adds span support when we implement 1D tiling. This fixes the text in progs/demos/engine and progs/tests/z* | ||||
| * | | | r600: fix warning | Alex Deucher | 2009-09-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Noticed by rnoland on IRC. | ||||
| * | | | st/mesa: minor whitespace, comment clean-ups | Brian Paul | 2009-09-14 | 1 | -21/+9 |
| | | | | |||||
| * | | | intel: minor code clean-ups | Brian Paul | 2009-09-14 | 1 | -11/+8 |
| | | | | |||||
| * | | | intel: fix renderbuffer map/unmap regression | Brian Paul | 2009-09-14 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | Commit 36dd53a3cded9d003ec418732b7fc93c1476aa9b caused a few regressions because the glReadBuffer() buffer wasn't getting mapped when GL_READ_BUFFER != GL_DRAW_BUFFER. | ||||
| * | | | intel: remove unneeded driver function assignments | Brian Paul | 2009-09-14 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | These default swrast functions are already installed by _mesa_init_driver_functions(). | ||||
| * | | | mesa/st: remove dead comment | Keith Whitwell | 2009-09-14 | 1 | -7/+0 |
| | | | | |||||
| * | | | st/mesa: convert to new tgsi_ureg mechanism for shader emit | Keith Whitwell | 2009-09-14 | 3 | -983/+625 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be easier to read and work with than the older ways of emitting TGSI tokens. Also, emit simpler TGSI than previously: - translate away source and dest extended modifiers - translate away the SWZ opcode | ||||
* | | | | slang: Propagate error messages from preprocessor. | Michal Krol | 2009-09-16 | 1 | -0/+5 |
| | | | | |||||
* | | | | slang: Invoke the preprocessor from withing the slang compiler. | Michal Krol | 2009-09-16 | 4 | -137/+132 |
| | | | | | | | | | | | | | | | | This allows us to validate the shader version number. | ||||
* | | | | grammar: Adapt to pp interface change. | Michal Krol | 2009-09-14 | 1 | -1/+4 |
| | | | | |||||
* | | | | Merge commit 'origin/master' into glsl-pp-rework-2 | Michal Krol | 2009-09-14 | 96 | -5855/+6869 |
|\| | | | |||||
| * | | | mesa: remove unused SATURATE_PLUS_MINUS_ONE flag | Keith Whitwell | 2009-09-12 | 2 | -3/+0 |
| | | | | | | | | | | | | | | | | Never set in mesa. Remove from tgsi translation as well. |