summaryrefslogtreecommitdiff
path: root/progs/glsl
AgeCommit message (Collapse)Author
2009-07-17Merge 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-17progs/glsl: finish conversion to GLEWBrian Paul
This is a follow-on to b799af91d5ffbee1481161fec29eb4c92b161272. Remove _func function suffix and unneeded #includes.
2009-07-13Merge branch 'mesa_7_5_branch'Brian Paul
2009-07-10demos: set 4th component of texcoord to 1.0Brian Paul
Avoid potential randomness in resulting texcoords.
2009-07-08demos: indentation fixBrian Paul
2009-07-08demos: use glEnable/DisableClientState() for vertex arraysBrian Paul
2009-06-29Merge branch 'mesa_7_5_branch'Brian Paul
2009-06-29progs/glsl: link with GLEW libraryBrian Paul
2009-06-29progs/glsl: compile with scons and glewKeith Whitwell
Get most of these working with scons.
2009-06-14Merge branch 'mesa_7_5_branch'Jakob Bornecrantz
2009-06-01Merge branch 'mesa_7_5_branch'Brian Paul
2009-06-01demos: add missing dependencies for util filesBrian Paul
2009-05-22demos: extend glsl/multitex.c to use a vertex buffer objectBrian Paul
2009-05-22demos: fix multitex.c VertCoord attribute mappingBrian 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-19progs/glsl: Update ignoreJakob Bornecrantz
2009-04-18demos: added glsl/texaaline.c program and overhaul the MakefileBrian Paul
2009-04-18demos: move glslnoise.c demo to glsl/noise2.cBrian Paul
2009-04-17demos: new glsl/array.c demoBrian Paul
Test variable indexing into a uniform array in a vertex shader.
2009-04-16demos: set init window size, not posBrian Paul
2009-04-09demos: fix aspect ratio in Reshape()Brian Paul
2009-04-02progs: IgnoresJakob Bornecrantz
2009-04-01demos: added progs/glsl/linktest.c to test linking of separate compilation unitsBrian Paul
2009-03-12progs/glsl: IgnoreJakob Bornecrantz
2009-02-28demos: 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-09mesa: merge gallium-0.2 into gallium-master-mergeBrian 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-02demos: update multitex.c GLSL demo to use vertex arrays or glVertex-modeBrian Paul
Press 'a' to toggle drawing mode.
2009-01-21progs: IgnoresJakob Bornecrantz
2009-01-14mesa: add new samplers_array testAlan Hourihane
2009-01-10mesa: Update .gitignoreYounes Manton
2009-01-05progs/glsl: Add ignoresJakob Bornecrantz
2009-01-05progs/glsl: Remove double target def for vert-or-frag-onlyJakob Bornecrantz
2009-01-03demos: remove redundant Makefile lines from prev mergeBrian
2009-01-02mesa: replace CC with APP_CC in progs/glsl/MakefileBrian Paul
2009-01-02Merge commit 'origin/master' into gallium-0.2Brian Paul
Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
2009-01-01demos: added progs/glsl/samplers.c to test all available texture samplersBrian Paul
2008-12-30Merge commit 'origin/master' into gallium-0.2Brian Paul
Conflicts: src/mesa/main/config.h
2008-12-30demos: minor fixes to twoside.c glsl demoBrian Paul
2008-12-19Merge commit 'origin/master' into gallium-0.2Brian Paul
2008-12-19mesa: s/CC/APP_CC/ in progs/glsl/MakefileBrian Paul
2008-12-18demos: add test of vertex-only and fragment-only shader programsBrian Paul
2008-12-17demos: add test of vertex-only and fragment-only shader programsBrian Paul
2008-12-15Merge commit 'origin/master' into gallium-0.2Alan Hourihane
2008-12-13Fix silly type mismatch error in multinoise demo.Gary Wong
2008-12-13Add "multinoise" demo, to test 1/2/3/4 dimensional noise.Gary Wong
2008-12-13Ensure p.w is initialised in noise demo.Gary Wong
2008-12-08fix conflict breakageAlan Hourihane
2008-12-08Merge commit 'origin/master' into gallium-0.2Alan Hourihane
Conflicts: progs/glsl/Makefile
2008-12-03demos: added simple vertex shader texture test.Brian
Draw a quadmesh where Z coord is taken from a texture map.
2008-12-02mesa: Update some .gitignore files.Younes Manton
2008-11-24remove some redundant rules from prev mergeBrian Paul
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-30 18:16:43 +0000