Age | Commit message (Collapse) | Author | |
---|---|---|---|
2009-07-17 | Merge branch 'mesa_7_5_branch' | Brian Paul | |
Conflicts: Makefile progs/glsl/multitex.c src/mesa/main/enums.c src/mesa/main/state.c src/mesa/main/texenvprogram.c src/mesa/main/version.h | |||
2009-07-17 | progs/glsl: finish conversion to GLEW | Brian Paul | |
This is a follow-on to b799af91d5ffbee1481161fec29eb4c92b161272. Remove _func function suffix and unneeded #includes. | |||
2009-07-13 | Merge branch 'mesa_7_5_branch' | Brian Paul | |
2009-07-10 | demos: set 4th component of texcoord to 1.0 | Brian Paul | |
Avoid potential randomness in resulting texcoords. | |||
2009-07-08 | demos: indentation fix | Brian Paul | |
2009-07-08 | demos: use glEnable/DisableClientState() for vertex arrays | Brian Paul | |
2009-06-29 | Merge branch 'mesa_7_5_branch' | Brian Paul | |
2009-06-29 | progs/glsl: link with GLEW library | Brian Paul | |
2009-06-29 | progs/glsl: compile with scons and glew | Keith Whitwell | |
Get most of these working with scons. | |||
2009-06-14 | Merge branch 'mesa_7_5_branch' | Jakob Bornecrantz | |
2009-06-01 | Merge branch 'mesa_7_5_branch' | Brian Paul | |
2009-06-01 | demos: add missing dependencies for util files | Brian Paul | |
2009-05-22 | demos: extend glsl/multitex.c to use a vertex buffer object | Brian Paul | |
2009-05-22 | demos: fix multitex.c VertCoord attribute mapping | Brian Paul | |
If the multitex.vert shader uses the VertCoord generic vertex attribute instead of the pre-defined gl_Vertex attribute, we need to make sure that VertCoord gets bound to generic vertex attribute zero. That's because we need to call glVertexAttrib2fv(0, xy) after all the other vertex attributes have been set since setting generic attribute 0 triggers vertex submission. Before, we wound up issuing the vertex attributes in the order 0, 1, 2 which caused the first vertex to be submitted before all the attributes were set. Now, the attributes are set in 1, 2, 0 order. | |||
2009-04-19 | progs/glsl: Update ignore | Jakob Bornecrantz | |
2009-04-18 | demos: added glsl/texaaline.c program and overhaul the Makefile | Brian Paul | |
2009-04-18 | demos: move glslnoise.c demo to glsl/noise2.c | Brian Paul | |
2009-04-17 | demos: new glsl/array.c demo | Brian Paul | |
Test variable indexing into a uniform array in a vertex shader. | |||
2009-04-16 | demos: set init window size, not pos | Brian Paul | |
2009-04-09 | demos: fix aspect ratio in Reshape() | Brian Paul | |
2009-04-02 | progs: Ignores | Jakob Bornecrantz | |
2009-04-01 | demos: added progs/glsl/linktest.c to test linking of separate compilation units | Brian Paul | |
2009-03-12 | progs/glsl: Ignore | Jakob Bornecrantz | |
2009-02-28 | demos: add progs/glsl/shadow_sampler.c to test GLSL shadow2D(), etc. | Brian Paul | |
Heh, I wrote this program a long time ago but just discovered today that it wasn't in git. | |||
2009-02-09 | mesa: merge gallium-0.2 into gallium-master-merge | Brian Paul | |
Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c | |||
2009-02-02 | demos: update multitex.c GLSL demo to use vertex arrays or glVertex-mode | Brian Paul | |
Press 'a' to toggle drawing mode. | |||
2009-01-21 | progs: Ignores | Jakob Bornecrantz | |
2009-01-14 | mesa: add new samplers_array test | Alan Hourihane | |
2009-01-10 | mesa: Update .gitignore | Younes Manton | |
2009-01-05 | progs/glsl: Add ignores | Jakob Bornecrantz | |
2009-01-05 | progs/glsl: Remove double target def for vert-or-frag-only | Jakob Bornecrantz | |
2009-01-03 | demos: remove redundant Makefile lines from prev merge | Brian | |
2009-01-02 | mesa: replace CC with APP_CC in progs/glsl/Makefile | Brian Paul | |
2009-01-02 | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | |
Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c | |||
2009-01-01 | demos: added progs/glsl/samplers.c to test all available texture samplers | Brian Paul | |
2008-12-30 | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | |
Conflicts: src/mesa/main/config.h | |||
2008-12-30 | demos: minor fixes to twoside.c glsl demo | Brian Paul | |
2008-12-19 | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | |
2008-12-19 | mesa: s/CC/APP_CC/ in progs/glsl/Makefile | Brian Paul | |
2008-12-18 | demos: add test of vertex-only and fragment-only shader programs | Brian Paul | |
2008-12-17 | demos: add test of vertex-only and fragment-only shader programs | Brian Paul | |
2008-12-15 | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | |
2008-12-13 | Fix silly type mismatch error in multinoise demo. | Gary Wong | |
2008-12-13 | Add "multinoise" demo, to test 1/2/3/4 dimensional noise. | Gary Wong | |
2008-12-13 | Ensure p.w is initialised in noise demo. | Gary Wong | |
2008-12-08 | fix conflict breakage | Alan Hourihane | |
2008-12-08 | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | |
Conflicts: progs/glsl/Makefile | |||
2008-12-03 | demos: added simple vertex shader texture test. | Brian | |
Draw a quadmesh where Z coord is taken from a texture map. | |||
2008-12-02 | mesa: Update some .gitignore files. | Younes Manton | |
2008-11-24 | remove some redundant rules from prev merge | Brian Paul | |