summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into glsl-pp-rework-2Michal Krol2009-09-1744-1924/+2641
|\ | | | | | | | | Conflicts: src/gallium/winsys/gdi/SConscript
| * mesa: begin some texstore code refactoringBrian Paul2009-09-161-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 Paul2009-09-162-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 Paul2009-09-161-25/+0
| |
| * s3v: remove unneeded initializationsBrian Paul2009-09-161-11/+0
| |
| * ffb: remove disabled codeBrian Paul2009-09-161-18/+0
| |
| * Merge branch 'mesa_7_6_branch'Ian Romanick2009-09-163-0/+668
| |\
| | * Merge branch 'mesa_7_5_branch' into mesa_7_6_branchIan Romanick2009-09-162-0/+667
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/dlist.c
| | | * intel: Deassociated drawables from private context struct in intelUnbindContextIan Romanick2009-09-161-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 listsBrian Paul2009-09-151-0/+242
| | | | | | | | | | | | | | | | | | | | I believe this is the last of the shader-related functions that needed display list treatment.
| | | * mesa: implement more glUniform display list functionsBrian Paul2009-09-151-1/+365
| | | |
| | | * mesa: compile glUniform4f() into display listsBrian Paul2009-09-151-0/+26
| | | | | | | | | | | | | | | | Note: there are more glUniform functions to compile...
| | | * mesa: compile glUseProgram/glUseProgramObjectARB into display listsBrian Paul2009-09-151-0/+28
| | | | | | | | | | | | | | | | Fixes bug 23746
| | * | i965: do a flush in clear, fix openarena render issue,Zou Nan hai2009-09-161-0/+1
| | | | | | | | | | | | | | | | fd.o bug# 23857
| * | | radeon: cleanup compile defines mess.Dave Airlie2009-09-169-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 patchDave Airlie2009-09-161-2/+0
| | | |
| * | | radeon: use txformat to decide to emit rect tex state.Dave Airlie2009-09-161-4/+8
| | | | | | | | | | | | | | | | This is more logical, and fixes a TFP issue.
| * | | mesa: move generate mipmap callsBrian Paul2009-09-1510-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-upBrian Paul2009-09-151-3/+3
| | | |
| * | | mesa: remove last of gotosBrian Paul2009-09-151-62/+62
| | | |
| * | | mesa: more goto removalBrian Paul2009-09-151-142/+129
| | | |
| * | | mesa: remove some gotosBrian Paul2009-09-151-105/+96
| | | | | | | | | | | | | | | | This will make some subsequent changes easier...
| * | | mesa: clean-up fbo debug codeBrian Paul2009-09-151-16/+23
| | | |
| * | | mesa: added GL_ARB_provoking_vertex (same as EXT version)Brian Paul2009-09-151-0/+1
| | | |
| * | | radeon: don't build non-r600 span code on r600Alex Deucher2009-09-151-1/+5
| | | |
| * | | r600: minor span cleanupsAlex Deucher2009-09-151-4/+3
| | | |
| * | | mesa: remove incorrect texture state checkBrian Paul2009-09-151-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() callBrian Paul2009-09-151-1/+1
| | | |
| * | | Merge branch 'mesa_7_6_branch'Brian Paul2009-09-154-4/+47
| |\| |
| | * | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-153-3/+46
| | |\|
| | | * glsl: added some link debug code (disabled)Brian Paul2009-09-141-0/+15
| | | |
| | | * glsl: remove extra #version directives from concatenated shader sourcesBrian Paul2009-09-141-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 errorsVinson Lee2009-09-111-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| | * | radeon: Remove structure allocation from iterator variable.Pauli Nieminen2009-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | dma_bo varaible is only used for iterating so allocating memory for it only causes memory leaks.
| * | | ARB prog parser: regenerated fileBrian Paul2009-09-151-193/+197
| | | |
| * | | ARB prog parser: more detailed error message for out of bounds ADDR offsetsBrian Paul2009-09-151-4/+8
| | | |
| * | | r600: support position_invariant programsAndre Maasikas2009-09-151-12/+18
| | | |
| * | | r600: add span support for 1D tilesAlex Deucher2009-09-143-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 warningAlex Deucher2009-09-141-0/+1
| | | | | | | | | | | | | | | | Noticed by rnoland on IRC.
| * | | st/mesa: minor whitespace, comment clean-upsBrian Paul2009-09-141-21/+9
| | | |
| * | | intel: minor code clean-upsBrian Paul2009-09-141-11/+8
| | | |
| * | | intel: fix renderbuffer map/unmap regressionBrian Paul2009-09-141-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 assignmentsBrian Paul2009-09-141-5/+0
| | | | | | | | | | | | | | | | | | | | These default swrast functions are already installed by _mesa_init_driver_functions().
| * | | mesa/st: remove dead commentKeith Whitwell2009-09-141-7/+0
| | | |
| * | | st/mesa: convert to new tgsi_ureg mechanism for shader emitKeith Whitwell2009-09-143-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 Krol2009-09-161-0/+5
| | | |
* | | | slang: Invoke the preprocessor from withing the slang compiler.Michal Krol2009-09-164-137/+132
| | | | | | | | | | | | | | | | This allows us to validate the shader version number.
* | | | grammar: Adapt to pp interface change.Michal Krol2009-09-141-1/+4
| | | |
* | | | Merge commit 'origin/master' into glsl-pp-rework-2Michal Krol2009-09-1496-5855/+6869
|\| | |
| * | | mesa: remove unused SATURATE_PLUS_MINUS_ONE flagKeith Whitwell2009-09-122-3/+0
| | | | | | | | | | | | | | | | Never set in mesa. Remove from tgsi translation as well.