summaryrefslogtreecommitdiff
path: root/progs/glsl
AgeCommit message (Collapse)Author
2009-08-20progs/glsl: update multitex.shtest for new texture syntaxBrian Paul
2009-08-20progs/glsl: update shtest.c to handle 1D/3D/CUBE/RECT texturesBrian Paul
2009-08-20progs/glsl: tweaks to shtest.cBrian Paul
1. Larger sphere to match cube size 2. Allow -geometry option to override window size 3. Cube samplers
2009-08-20progs/glsl: more comments in shtest.cBrian Paul
2009-08-17demos/glsl: remove glutInitWindowPosition() callsBrian Paul
2009-08-15mesa: Add 2 new demos to .gitignore.Pauli Nieminen
2009-08-14glsl: re-write Makefile after I called it bad.Dave Airlie
2009-08-13progs/glsl: added multitex.shtest config fileBrian Paul
2009-08-13progs/glsl: set generic vertex attribute valuesBrian Paul
2009-08-13progs/glsl: add type field to shtest config filesBrian Paul
Plus, texture loading.
2009-08-14glsl/tests: skinning.oDave Airlie
worst Makefile ever. not sure what is going on here, hopefully this fixes tinderbox
2009-08-13progs/glsl: new shtest program, a simple shader test harness appBrian Paul
This commit includes some sample config files (*.shtest)
2009-08-12progs/glsl: change uniform_info::type field to use GLSL vector typesBrian Paul
2009-08-12demos: rename InitUniforms() to SetUniformValues()Brian Paul
And call new PrintUniforms() in demos.
2009-08-10demos: Fix the VBO usage in glsl/multitex.Eric Anholt
The fix for 965 to be noisy when apps sent pointers instead of VBO offsets caught this app in the act of doing exactly that. Bug #23203
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