Brian Paul
08ecd863ee
progs/glsl: set generic vertex attribute values
2009-08-13 17:03:56 -06:00
Brian Paul
62d1132160
progs/glsl: add type field to shtest config files
...
Plus, texture loading.
2009-08-13 17:03:56 -06:00
Dave Airlie
25cd4dc1d6
glsl/tests: skinning.o
...
worst Makefile ever. not sure what is going on here, hopefully
this fixes tinderbox
2009-08-14 08:35:49 +10:00
Brian Paul
ae99e4c67e
progs/glsl: new shtest program, a simple shader test harness app
...
This commit includes some sample config files (*.shtest)
2009-08-13 12:52:13 -06:00
Brian Paul
fdfb0d4b0e
progs/glsl: change uniform_info::type field to use GLSL vector types
2009-08-12 17:28:45 -06:00
Brian Paul
684049d97d
demos: rename InitUniforms() to SetUniformValues()
...
And call new PrintUniforms() in demos.
2009-08-12 17:28:45 -06:00
Eric Anholt
74504c48ad
demos: Fix the VBO usage in glsl/multitex.
...
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-08-10 15:53:47 -07:00
Brian Paul
b96ae1b2c4
Merge branch 'mesa_7_5_branch'
...
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 22:00:47 -06:00
Brian Paul
ee0b1bc7d3
progs/glsl: finish conversion to GLEW
...
This is a follow-on to b799af91d5
2009-07-17 13:23:11 -06:00
Brian Paul
9615daa932
Merge branch 'mesa_7_5_branch'
2009-07-13 08:47:37 -06:00
Brian Paul
6ff1a5385e
demos: set 4th component of texcoord to 1.0
...
Avoid potential randomness in resulting texcoords.
2009-07-10 13:09:09 -06:00
Brian Paul
f742f2c0b3
demos: indentation fix
2009-07-08 13:59:03 -06:00
Brian Paul
820436f978
demos: use glEnable/DisableClientState() for vertex arrays
2009-07-08 13:58:30 -06:00
Brian Paul
7b5373c434
Merge branch 'mesa_7_5_branch'
2009-06-29 11:20:07 -06:00
Brian Paul
b1f2f92d9b
progs/glsl: link with GLEW library
2009-06-29 10:32:04 -06:00
Keith Whitwell
b799af91d5
progs/glsl: compile with scons and glew
...
Get most of these working with scons.
2009-06-29 14:15:08 +01:00
Jakob Bornecrantz
2fe65e8f14
Merge branch 'mesa_7_5_branch'
2009-06-14 16:56:34 +02:00
Brian Paul
9f6ec50f8c
Merge branch 'mesa_7_5_branch'
2009-06-01 15:01:33 -06:00
Brian Paul
a5d033e89b
demos: add missing dependencies for util files
2009-06-01 11:23:39 -06:00
Brian Paul
891a2bdd7d
demos: extend glsl/multitex.c to use a vertex buffer object
2009-05-22 13:12:28 -06:00
Brian Paul
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
Jakob Bornecrantz
59c8e738c4
progs/glsl: Update ignore
2009-04-19 16:23:49 +01:00
Brian Paul
c0565e86b4
demos: added glsl/texaaline.c program and overhaul the Makefile
2009-04-18 14:18:59 -06:00
Brian Paul
118856641f
demos: move glslnoise.c demo to glsl/noise2.c
2009-04-18 12:54:27 -06:00
Brian Paul
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
Brian Paul
189db329ca
demos: set init window size, not pos
2009-04-16 22:07:53 -06:00
Brian Paul
08a1e1ebcb
demos: fix aspect ratio in Reshape()
2009-04-09 17:04:58 -06:00
Jakob Bornecrantz
29a1ed599b
progs: Ignores
2009-04-02 17:00:25 +02:00
Brian Paul
f8304bf1ed
demos: added progs/glsl/linktest.c to test linking of separate compilation units
2009-04-01 19:54:35 -06:00
Jakob Bornecrantz
b7d841b59e
progs/glsl: Ignore
2009-03-12 14:05:50 +01:00
Brian Paul
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
Brian Paul
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
Brian Paul
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
Jakob Bornecrantz
c14aac5530
progs: Ignores
2009-01-21 15:01:13 +01:00
Alan Hourihane
e82784559e
mesa: add new samplers_array test
2009-01-14 17:01:16 +00:00
Younes Manton
6cee4b8d7e
mesa: Update .gitignore
2009-01-10 14:11:30 -05:00
Jakob Bornecrantz
5256f94b1a
progs/glsl: Add ignores
2009-01-05 11:52:30 +01:00
Jakob Bornecrantz
b2e9d415ed
progs/glsl: Remove double target def for vert-or-frag-only
2009-01-05 11:52:30 +01:00
Brian
fa4fec2d1b
demos: remove redundant Makefile lines from prev merge
2009-01-03 14:39:49 -07:00
Brian Paul
84cffc2e7f
mesa: replace CC with APP_CC in progs/glsl/Makefile
2009-01-02 16:52:00 -07:00
Brian Paul
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
Brian Paul
46b8fe00c9
demos: added progs/glsl/samplers.c to test all available texture samplers
2009-01-01 14:02:17 -07:00
Brian Paul
c789bd376f
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/main/config.h
2008-12-30 18:01:15 -07:00
Brian Paul
c9122072fc
demos: minor fixes to twoside.c glsl demo
2008-12-30 07:24:19 -07:00
Brian Paul
58a82ee57f
Merge commit 'origin/master' into gallium-0.2
2008-12-19 16:56:56 -07:00
Brian Paul
aae74c3698
mesa: s/CC/APP_CC/ in progs/glsl/Makefile
2008-12-19 07:57:09 -07:00
Brian Paul
bde3b3a164
demos: add test of vertex-only and fragment-only shader programs
2008-12-18 14:17:06 -07:00
Brian Paul
1cb680d06b
demos: add test of vertex-only and fragment-only shader programs
2008-12-17 13:58:31 -07:00
Alan Hourihane
a22d865f93
Merge commit 'origin/master' into gallium-0.2
2008-12-15 11:16:03 +00:00
Gary Wong
a42342cd90
Fix silly type mismatch error in multinoise demo.
2008-12-13 20:06:21 -07:00
