Commit Graph

161 Commits

Author SHA1 Message Date
Brian Paul
0311d9ccf4 progs/glsl: updates to deriv.c test
Pass window size into the shader so scaling the window doesn't effect
the colors.
2009-12-07 09:03:41 -07:00
Brian Paul
8796dbf519 progs/glsl: added texture mapping to bump demo
Press 't' to toggle texture map.
2009-12-07 07:46:02 -07:00
Vinson Lee
881f55236a progs/glsl: Redraw upon keypress. 2009-11-19 22:46:19 -08:00
Vinson Lee
4b3ec2acf2 progs/glsl: Fix trirast GLSL compilation errors on Mac OS. 2009-11-18 14:02:20 -08:00
Vinson Lee
0d31990b47 progs/glsl: Fix noise GLSL compilation error on Mac OS. 2009-11-18 13:50:49 -08:00
Vinson Lee
d4dc2e30da progs/glsl: Fix multinoise GLSL compilation errors on Mac OS. 2009-11-18 12:49:31 -08:00
Vinson Lee
04442841fb progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS. 2009-11-17 23:15:25 -08:00
Brian Paul
89e20ab3ae progs/glsl: use ShadersSupported() 2009-11-17 19:22:29 -07:00
Brian Paul
b08f447547 progs/glsl: change //-style comments 2009-11-17 16:16:30 -07:00
Vinson Lee
b8dcb79c53 progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.
tangentAtrrib is assigned the result of glGetAttribLocation.
The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if
tangentAttrib is a GLuint.
2009-11-17 11:37:48 -08:00
Vinson Lee
0e783c7d03 progs/glsl: Fix memory leak in deriv.c. 2009-11-17 09:54:54 -08:00
Vinson Lee
43080e40aa progs/glsl: Add missing break statement in multinoise.c. 2009-11-12 16:21:49 -08:00
Vinson Lee
7dfea5c072 demos/glsl: Add missing break statement to noise test. 2009-11-11 17:39:58 -08:00
Brian Paul
55770d09c1 Merge branch 'mesa_7_6_branch'
Conflicts:

	src/gallium/auxiliary/util/u_cpu_detect.c
2009-10-05 14:42:08 -06:00
Jon TURNEY
a15d9ca9cc Fix building of GLSL demos which use M_PI
Some <math.h> files do not define M_PI, in which case, provide our own definition

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-10-05 11:07:23 -06:00
Vinson Lee
d17af7d1e1 progs/glsl: Include local headers before installed headers during compilation.
Fixes compilation errors on platforms with insufficient older installed
GL headers.
2009-09-21 08:44:56 -06:00
Brian Paul
4df2f7af5e progs/glsl: minor Makefile clean-ups 2009-09-16 19:28:55 -06:00
Brian Paul
7205221051 progs/glsl: asst. changes in shtest.c 2009-08-26 12:16:18 -06:00
Brian Paul
476290946e Merge branch 'mesa_7_5_branch' 2009-08-26 12:01:23 -06:00
Brian Paul
2bcf787de1 progs/glsl: handle window resizes in texaaline.c 2009-08-26 11:56:56 -06:00
Brian Paul
488b3c4d1b progs/glsl: add special Makefile rule for samplers_array 2009-08-26 11:55:15 -06:00
Brian Paul
f6d34c2058 progs/glsl: change samplers.c to better test sampler/texture indexing
Now the left half is yellow and the right half is red, with the gradients
going in opposite directions.
2009-08-26 11:53:25 -06:00
Brian Paul
42675ff0e3 progs/glsl: call ValidateShaderProgram() 2009-08-25 17:46:11 -06:00
Brian Paul
a215da5e9c progs/glsl: report compile/link times in shtest.c 2009-08-20 14:43:32 -06:00
Brian Paul
8a883d1657 progs/glsl: update multitex.shtest for new texture syntax 2009-08-20 14:43:32 -06:00
Brian Paul
0062bd68b3 progs/glsl: update shtest.c to handle 1D/3D/CUBE/RECT textures 2009-08-20 14:43:32 -06:00
Brian Paul
174054c973 progs/glsl: tweaks to shtest.c
1. Larger sphere to match cube size
2. Allow -geometry option to override window size
3. Cube samplers
2009-08-20 14:43:32 -06:00
Brian Paul
94d14f6cd2 progs/glsl: more comments in shtest.c 2009-08-20 10:52:13 -06:00
Brian Paul
680df529a3 demos/glsl: remove glutInitWindowPosition() calls 2009-08-17 17:13:17 -06:00
Pauli Nieminen
57f55af219 mesa: Add 2 new demos to .gitignore. 2009-08-15 13:30:15 -06:00
Dave Airlie
ceb9459ed5 glsl: re-write Makefile after I called it bad. 2009-08-14 10:05:10 +10:00
Brian Paul
0c717bcd5d progs/glsl: added multitex.shtest config file 2009-08-13 17:03:57 -06:00
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.
Remove _func function suffix and unneeded #includes.
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