9f6ec50f8c
Merge branch 'mesa_7_5_branch'
2009-06-01 15:01:33 -06:00
a5d033e89b
demos: add missing dependencies for util files
2009-06-01 11:23:39 -06:00
891a2bdd7d
demos: extend glsl/multitex.c to use a vertex buffer object
2009-05-22 13:12:28 -06:00
58fadc6242
demos: fix multitex.c VertCoord attribute mapping
...
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-05-22 13:00:49 -06:00
59c8e738c4
progs/glsl: Update ignore
2009-04-19 16:23:49 +01:00
c0565e86b4
demos: added glsl/texaaline.c program and overhaul the Makefile
2009-04-18 14:18:59 -06:00
118856641f
demos: move glslnoise.c demo to glsl/noise2.c
2009-04-18 12:54:27 -06:00
538a823882
demos: new glsl/array.c demo
...
Test variable indexing into a uniform array in a vertex shader.
2009-04-17 16:23:33 -06:00
189db329ca
demos: set init window size, not pos
2009-04-16 22:07:53 -06:00
08a1e1ebcb
demos: fix aspect ratio in Reshape()
2009-04-09 17:04:58 -06:00
29a1ed599b
progs: Ignores
2009-04-02 17:00:25 +02:00
f8304bf1ed
demos: added progs/glsl/linktest.c to test linking of separate compilation units
2009-04-01 19:54:35 -06:00
b7d841b59e
progs/glsl: Ignore
2009-03-12 14:05:50 +01:00
fe35378769
demos: add progs/glsl/shadow_sampler.c to test GLSL shadow2D(), etc.
...
Heh, I wrote this program a long time ago but just discovered today that
it wasn't in git.
2009-02-28 11:09:13 -07:00
e97681c7f5
mesa: merge gallium-0.2 into gallium-master-merge
...
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-09 09:22:22 -07:00
8e8b25c26a
demos: update multitex.c GLSL demo to use vertex arrays or glVertex-mode
...
Press 'a' to toggle drawing mode.
2009-02-02 16:51:45 -07:00
c14aac5530
progs: Ignores
2009-01-21 15:01:13 +01:00
e82784559e
mesa: add new samplers_array test
2009-01-14 17:01:16 +00:00
6cee4b8d7e
mesa: Update .gitignore
2009-01-10 14:11:30 -05:00
5256f94b1a
progs/glsl: Add ignores
2009-01-05 11:52:30 +01:00
b2e9d415ed
progs/glsl: Remove double target def for vert-or-frag-only
2009-01-05 11:52:30 +01:00
fa4fec2d1b
demos: remove redundant Makefile lines from prev merge
2009-01-03 14:39:49 -07:00
84cffc2e7f
mesa: replace CC with APP_CC in progs/glsl/Makefile
2009-01-02 16:52:00 -07:00
0815ebccfc
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/main/ffvertex_prog.c
src/mesa/main/texenvprogram.c
2009-01-02 16:32:26 -07:00
46b8fe00c9
demos: added progs/glsl/samplers.c to test all available texture samplers
2009-01-01 14:02:17 -07:00
c789bd376f
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/main/config.h
2008-12-30 18:01:15 -07:00
c9122072fc
demos: minor fixes to twoside.c glsl demo
2008-12-30 07:24:19 -07:00
58a82ee57f
Merge commit 'origin/master' into gallium-0.2
2008-12-19 16:56:56 -07:00
aae74c3698
mesa: s/CC/APP_CC/ in progs/glsl/Makefile
2008-12-19 07:57:09 -07:00
bde3b3a164
demos: add test of vertex-only and fragment-only shader programs
2008-12-18 14:17:06 -07:00
1cb680d06b
demos: add test of vertex-only and fragment-only shader programs
2008-12-17 13:58:31 -07:00
a22d865f93
Merge commit 'origin/master' into gallium-0.2
2008-12-15 11:16:03 +00:00
a42342cd90
Fix silly type mismatch error in multinoise demo.
2008-12-13 20:06:21 -07:00
d427a2910f
Add "multinoise" demo, to test 1/2/3/4 dimensional noise.
2008-12-13 14:28:04 -07:00
0df3dfab82
Ensure p.w is initialised in noise demo.
2008-12-13 14:25:52 -07:00
e8a1b31ddf
fix conflict breakage
2008-12-08 15:03:29 +00:00
33a1f495d4
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/glsl/Makefile
2008-12-08 14:29:50 +00:00
39091cc638
demos: added simple vertex shader texture test.
...
Draw a quadmesh where Z coord is taken from a texture map.
2008-12-03 18:55:25 -07:00
25eee19cd6
mesa: Update some .gitignore files.
2008-12-02 16:15:13 -05:00
77762801bc
remove some redundant rules from prev merge
2008-11-24 14:31:41 -07:00
df6155fcff
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/glsl/Makefile
2008-11-24 14:08:58 -07:00
80301866f6
added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader
...
Fragment's red/greenb/blue is a function gl_FragCoord.xyz
2008-11-24 13:11:05 -07:00
51af35b7cc
progs: Add ignores
2008-11-24 20:05:47 +01:00
c45c5c4ca4
added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader
...
Fragment's red/greenb/blue is a function gl_FragCoord.xyz
2008-11-21 10:04:37 -07:00
19e4222f93
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-11 14:42:41 -07:00
e5359401d6
undo accidental changes to multitex.frag shader
2008-11-10 12:39:36 -07:00
2c204bbf77
use APP_CC, not CC for skinning demo
2008-11-05 17:14:23 -07:00
2382dc8aff
Merge commit 'origin/master' into gallium-0.2
2008-11-05 11:59:12 +00:00
aab429c8df
added glsl/skinning.c test to test matrix blending/weighting
2008-11-04 16:56:59 -07:00
d3222cb1d4
remove old debug glFlush/Finish calls from demos
2008-11-04 16:55:18 -07:00
Brian Paul