Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2009-01-02 | 2 | -0/+365 |
|\ | | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c | ||||
| * | demos: added progs/glsl/samplers.c to test all available texture samplers | Brian Paul | 2009-01-01 | 2 | -0/+365 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-12-30 | 1 | -16/+28 |
|\| | | | | | | | | | | | Conflicts: src/mesa/main/config.h | ||||
| * | demos: minor fixes to twoside.c glsl demo | Brian Paul | 2008-12-30 | 1 | -16/+28 |
| | | |||||
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | José Fonseca | 2008-12-22 | 1 | -5/+5 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/Makefile | ||||
| * | | Ignore new tests executables. | José Fonseca | 2008-12-21 | 1 | -5/+20 |
| | | | |||||
| * | | scons: Build progs. | José Fonseca | 2008-12-12 | 4 | -0/+281 |
| | | | | | | | | | | | | | | | | | | | | | | | | Just demos and trivial dirs for starters. Conflicts: .gitignore | ||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-12-19 | 1 | -0/+8 |
|\ \ \ | | |/ | |/| | |||||
| * | | demos: all glutDestroyWindow() upon exit to test query object clean-up | Brian Paul | 2008-12-18 | 1 | -2/+3 |
| | | | |||||
| * | | demos: add test of vertex-only and fragment-only shader programs | Brian Paul | 2008-12-17 | 2 | -0/+200 |
| | | | |||||
| * | | util: check for frag/vertShader=0 before attaching | Brian Paul | 2008-12-17 | 1 | -2/+7 |
| | | | |||||
* | | | mesa: s/CC/APP_CC/ in progs/glsl/Makefile | Brian Paul | 2008-12-19 | 1 | -5/+5 |
| | | | |||||
* | | | demos: all glutDestroyWindow() upon exit to test query object clean-up | Brian Paul | 2008-12-18 | 1 | -2/+3 |
| | | | |||||
* | | | demos: add test of vertex-only and fragment-only shader programs | Brian Paul | 2008-12-18 | 2 | -0/+200 |
| | | | |||||
* | | | util: check for frag/vertShader=0 before attaching | Brian Paul | 2008-12-18 | 1 | -2/+7 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-12-16 | 2 | -46/+136 |
|\| | | |||||
| * | | demos: updated tests/floattex.c (doesn't work just yet). | Brian Paul | 2008-12-15 | 2 | -46/+136 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-15 | 4 | -0/+284 |
|\| | | |||||
| * | | Fix silly type mismatch error in multinoise demo. | Gary Wong | 2008-12-13 | 1 | -4/+8 |
| | | | |||||
| * | | Add "multinoise" demo, to test 1/2/3/4 dimensional noise. | Gary Wong | 2008-12-13 | 3 | -0/+279 |
| | | | |||||
| * | | Ensure p.w is initialised in noise demo. | Gary Wong | 2008-12-13 | 1 | -0/+1 |
| | | | |||||
* | | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Brian Paul | 2008-12-10 | 3 | -0/+272 |
|\ \ \ | | |/ | |/| | |||||
| * | | mesa: more trivial tests | Keith Whitwell | 2008-12-10 | 3 | -0/+272 |
| | | | |||||
* | | | fix conflict breakage | Alan Hourihane | 2008-12-08 | 1 | -4/+0 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-08 | 2 | -1/+292 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: progs/glsl/Makefile | ||||
| * | | demos: added simple vertex shader texture test. | Brian | 2008-12-03 | 2 | -1/+287 |
| | | | | | | | | | | | | Draw a quadmesh where Z coord is taken from a texture map. | ||||
* | | | mesa: Update some .gitignore files. | Younes Manton | 2008-12-02 | 2 | -0/+17 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-11-28 | 1 | -3/+12 |
|\| | | |||||
| * | | demos: press SPACE to toggle fbo_firecube animation | Brian Paul | 2008-11-26 | 1 | -3/+12 |
| | | | |||||
* | | | remove some redundant rules from prev merge | Brian Paul | 2008-11-24 | 1 | -7/+0 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-11-24 | 1 | -0/+7 |
|\| | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile | ||||
| * | | added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader | Brian Paul | 2008-11-21 | 2 | -0/+193 |
| | | | | | | | | | | | | Fragment's red/greenb/blue is a function gl_FragCoord.xyz | ||||
* | | | added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader | Brian Paul | 2008-11-24 | 2 | -0/+193 |
| | | | | | | | | | | | | Fragment's red/greenb/blue is a function gl_FragCoord.xyz | ||||
* | | | progs: Add ignores | Jakob Bornecrantz | 2008-11-24 | 2 | -0/+3 |
| | | | |||||
* | | | scons: Build progs. | José Fonseca | 2008-11-21 | 4 | -0/+281 |
| | | | | | | | | | | | | Just demos and trivial dirs for starters. | ||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Keith Whitwell | 2008-11-15 | 3 | -0/+275 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_print.c | ||||
| * | | Add glsync demo program from jbarnes for testing vblank synchronization. | Eric Anholt | 2008-11-12 | 3 | -0/+275 |
| | | | |||||
* | | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Keith Whitwell | 2008-11-15 | 8 | -0/+1064 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_util.c | ||||
| * | | trivial: more tests | Keith Whitwell | 2008-11-14 | 8 | -0/+1064 |
| | | | |||||
* | | | mesa: fix build | Alan Hourihane | 2008-11-14 | 1 | -2/+1 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-11-11 | 2 | -23/+3 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h | ||||
| * | | mesa: fix version check in dinoshade.c | Brian Paul | 2008-11-11 | 1 | -1/+1 |
| | | | |||||
| * | | undo accidental changes to multitex.frag shader | Brian Paul | 2008-11-10 | 1 | -22/+2 |
| | | | |||||
* | | | CELL: two-sided stencil fixes | Robert Ellison | 2008-11-11 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With these changes, the tests/stencil_twoside test now works. - Eliminate blending from the stencil_twoside test, as it produces an unneeded dependency on having blending working - The spe_splat() function will now work if the register being splatted and the destination register are the same - Separate fragment code generated for front-facing and back-facing fragments. Often these are the same; if two-sided stenciling is on, they can be different. This is easier and faster than generating code that does both tests and merges the results. - Fixed a cut/paste bug where if the back Z-pass stencil operation were different from all the other operations, the back Z-fail results were incorrect. | ||||
* | | | use APP_CC, not CC for skinning demo | Brian Paul | 2008-11-05 | 1 | -2/+2 |
| | | | |||||
* | | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-11-05 | 10 | -11/+341 |
|\| | | |||||
| * | | added glsl/skinning.c test to test matrix blending/weighting | Brian Paul | 2008-11-04 | 5 | -2/+340 |
| | | | |||||
| * | | print err msg if unable to open shader file | Brian Paul | 2008-11-04 | 1 | -0/+1 |
| | | | |||||
| * | | remove old debug glFlush/Finish calls from demos | Brian Paul | 2008-11-04 | 4 | -9/+0 |
| | | | |||||
* | | | CELL: stencil bug fixes | Robert Ellison | 2008-10-30 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two definitive bugs in stenciling were fixed. The first, reversed registers in the generated Select Bytes (selb) instruction, caused the stenciling INCR and DECR operations to fail dramatically, putting new values in where old values were supposed to be and vice versa. The second caused stencil tiles to not be read and written from main memory by the SPUs. A per-spu flag, spu.read_depth, was used to indicate whether the SPU should be reading depth tiles, and was set only when depth was enabled. A second flag, spu.read_stencil, was set when stenciling was enabled, but never referenced. As stenciling and depth are in the same tiles on the Cell, and there is no corresponding TAG_WRITE_TILE_STENCIL to complement TAG_WRITE_TILE_COLOR and TAG_WRITE_TILE_Z, I fixed this by eliminating the unused "spu.read_stencil", renaming "spu.read_depth" to "spu.read_depth_stencil", and setting it if either stenciling or depth is enabled. I also added an optimization to the fragment ops generation code, that avoids calculating stencil values and/or stencil writemask when the stencil operations are all KEEP. |