summaryrefslogtreecommitdiffstats
path: root/progs/glsl
Commit message (Collapse)AuthorAgeFilesLines
* demos: Fix the VBO usage in glsl/multitex.Eric Anholt2009-08-101-3/+3
| | | | | | | 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
* Merge branch 'mesa_7_5_branch'Brian Paul2009-07-1724-356/+245
|\ | | | | | | | | | | | | | | | | | | | | 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
| * progs/glsl: finish conversion to GLEWBrian Paul2009-07-1724-344/+232
| | | | | | | | | | This is a follow-on to b799af91d5ffbee1481161fec29eb4c92b161272. Remove _func function suffix and unneeded #includes.
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-07-131-0/+1
|\|
| * demos: set 4th component of texcoord to 1.0Brian Paul2009-07-101-0/+1
| | | | | | | | Avoid potential randomness in resulting texcoords.
* | demos: indentation fixBrian Paul2009-07-081-1/+1
| |
* | demos: use glEnable/DisableClientState() for vertex arraysBrian Paul2009-07-081-1/+1
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-291-1/+1
|\|
| * progs/glsl: link with GLEW libraryBrian Paul2009-06-291-1/+1
| |
* | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-06-1426-1/+105
|\|
| * progs/glsl: compile with scons and glewKeith Whitwell2009-06-2926-1/+105
| | | | | | | | Get most of these working with scons.
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-011-10/+11
|\|
| * demos: add missing dependencies for util filesBrian Paul2009-06-011-10/+11
| |
| * demos: fix multitex.c VertCoord attribute mappingBrian Paul2009-05-221-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | demos: extend glsl/multitex.c to use a vertex buffer objectBrian Paul2009-05-221-6/+87
|/
* progs/glsl: Update ignoreJakob Bornecrantz2009-04-191-0/+3
|
* demos: added glsl/texaaline.c program and overhaul the MakefileBrian Paul2009-04-182-148/+499
|
* demos: move glslnoise.c demo to glsl/noise2.cBrian Paul2009-04-182-0/+209
|
* demos: new glsl/array.c demoBrian Paul2009-04-172-0/+269
| | | | Test variable indexing into a uniform array in a vertex shader.
* demos: set init window size, not posBrian Paul2009-04-161-1/+1
|
* demos: fix aspect ratio in Reshape()Brian Paul2009-04-091-1/+2
|
* progs: IgnoresJakob Bornecrantz2009-04-021-0/+1
|
* demos: added progs/glsl/linktest.c to test linking of separate compilation unitsBrian Paul2009-04-012-0/+265
|
* progs/glsl: IgnoreJakob Bornecrantz2009-03-121-0/+1
|
* demos: add progs/glsl/shadow_sampler.c to test GLSL shadow2D(), etc.Brian Paul2009-02-282-0/+342
| | | | | Heh, I wrote this program a long time ago but just discovered today that it wasn't in git.
* mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-097-58/+302
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * progs: IgnoresJakob Bornecrantz2009-01-211-0/+1
| |
| * mesa: add new samplers_array testAlan Hourihane2009-01-142-0/+18
| |
| * mesa: Update .gitignoreYounes Manton2009-01-101-0/+1
| |
| * progs/glsl: Add ignoresJakob Bornecrantz2009-01-051-0/+2
| |
| * progs/glsl: Remove double target def for vert-or-frag-onlyJakob Bornecrantz2009-01-051-1/+0
| |
| * demos: remove redundant Makefile lines from prev mergeBrian2009-01-031-8/+0
| |
| * mesa: replace CC with APP_CC in progs/glsl/MakefileBrian Paul2009-01-021-6/+6
| |
| * Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-022-0/+365
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
| * \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-301-16/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/config.h
| * \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-191-0/+8
| |\ \ \
| * | | | mesa: s/CC/APP_CC/ in progs/glsl/MakefileBrian Paul2008-12-191-5/+5
| | | | |
| * | | | demos: add test of vertex-only and fragment-only shader programsBrian Paul2008-12-182-0/+200
| | | | |
| * | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-154-0/+284
| |\ \ \ \
| * | | | | fix conflict breakageAlan Hourihane2008-12-081-4/+0
| | | | | |
| * | | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-082-1/+292
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * | | | | | mesa: Update some .gitignore files.Younes Manton2008-12-021-0/+1
| | | | | | |
| * | | | | | remove some redundant rules from prev mergeBrian Paul2008-11-241-7/+0
| | | | | | |
| * | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-241-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * | | | | | | added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shaderBrian Paul2008-11-242-0/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fragment's red/greenb/blue is a function gl_FragCoord.xyz
| * | | | | | | progs: Add ignoresJakob Bornecrantz2008-11-241-0/+2
| | | | | | | |
| * | | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-111-22/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
| * | | | | | | | use APP_CC, not CC for skinning demoBrian Paul2008-11-051-2/+2
| | | | | | | | |
| * | | | | | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-059-11/+340
| |\ \ \ \ \ \ \ \
| * | | | | | | | | mesa: don't continually redrawBrian Paul2008-10-281-1/+1
| | | | | | | | | |