Brian Paul 9eb7fc6661 Merge branch 'mesa_7_7_branch' ...

Conflicts:
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom_shader.c

2009-12-21 18:35:54 -07:00

..

.gitignore

mesa: Add 2 new demos to .gitignore.

2009-08-15 13:30:15 -06:00

array.c

progs/glsl: finish conversion to GLEW

2009-07-17 13:23:11 -06:00

bitmap.c

progs/glsl: finish conversion to GLEW

2009-07-17 13:23:11 -06:00

brick.c

demos/glsl: remove glutInitWindowPosition() calls

2009-08-17 17:13:17 -06:00

brick.shtest

progs/glsl: add type field to shtest config files

2009-08-13 17:03:56 -06:00

bump.c

progs/glsl: added texture mapping to bump demo

2009-12-07 07:46:02 -07:00

CH06-brick.frag

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06:00

CH06-brick.vert

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06:00

CH11-bumpmap.frag

replace 1.0/sqrt() with inversesqrt()

2008-10-10 12:04:49 -06:00

CH11-bumpmap.vert

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06:00

CH11-bumpmaptex.frag

progs/glsl: added texture mapping to bump demo

2009-12-07 07:46:02 -07:00

CH11-toyball.frag

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06:00

CH11-toyball.vert

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06:00

CH18-mandel.frag

progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.

2009-12-02 19:55:48 -08:00

CH18-mandel.vert

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06:00

convolution.frag

mesa: added glsl/convolutions test from gallium branch

2008-08-16 09:34:12 -06:00

convolution.vert

mesa: added glsl/convolutions test from gallium branch

2008-08-16 09:34:12 -06:00

convolutions.c

progs/glsl: Redraw upon keypress.

2009-12-03 17:17:24 -08:00

cubemap.frag

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06:00

deriv.c

progs/glsl: updates to deriv.c test

2009-12-07 09:03:41 -07:00

fragcoord.c

demos/glsl: remove glutInitWindowPosition() calls

2009-08-17 17:13:17 -06:00

identity.c

demos/glsl: remove glutInitWindowPosition() calls

2009-08-17 17:13:17 -06:00

linktest.c

progs/glsl: finish conversion to GLEW

2009-07-17 13:23:11 -06:00

Makefile

progs/glsl: Include local headers before installed headers during compilation.

2009-12-02 19:39:25 -08:00

mandelbrot.c

demos/glsl: remove glutInitWindowPosition() calls

2009-08-17 17:13:17 -06:00

mandelbrot.shtest

progs/glsl: add type field to shtest config files

2009-08-13 17:03:56 -06:00

multinoise.c

progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.

2009-12-02 20:06:20 -08:00

multitex.c

progs/glsl: use ShadersSupported()

2009-11-17 19:22:29 -07:00

multitex.frag

undo accidental changes to multitex.frag shader

2008-11-10 12:39:36 -07:00

multitex.shtest

progs/glsl: update multitex.shtest for new texture syntax

2009-08-20 14:43:32 -06:00

multitex.vert

demos: update multitex.c GLSL demo to use vertex arrays or glVertex-mode

2009-02-02 16:51:45 -07:00

noise2.c

demos/glsl: remove glutInitWindowPosition() calls

2009-08-17 17:13:17 -06:00

noise.c

progs/glsl: Fix noise GLSL compilation error on Mac OS.

2009-12-02 20:16:51 -08:00

pointcoord.c

demos/glsl: remove glutInitWindowPosition() calls

2009-08-17 17:13:17 -06:00

points.c

progs/glsl: finish conversion to GLEW

2009-07-17 13:23:11 -06:00

reflect.vert

demos: set 4th component of texcoord to 1.0

2009-07-10 13:09:09 -06:00

samplers.c

progs/glsl: change samplers.c to better test sampler/texture indexing

2009-08-26 11:53:25 -06:00

SConscript

progs/glsl: compile with scons and glew

2009-06-29 14:15:08 +01:00

shadow_sampler.c

demos/glsl: remove glutInitWindowPosition() calls

2009-08-17 17:13:17 -06:00

shadowtex.frag

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06:00

shtest.c

progs/glsl: Use C-style comments.

2009-12-18 23:38:15 -08:00

simple.vert

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06:00

skinning.c

Fix building of GLSL demos which use M_PI

2009-10-05 11:07:23 -06:00

skinning.frag

added glsl/skinning.c test to test matrix blending/weighting

2008-11-04 16:56:59 -07:00

skinning.vert

added glsl/skinning.c test to test matrix blending/weighting

2008-11-04 16:56:59 -07:00

texaaline.c

progs/glsl: Use C-style comments.

2009-12-18 23:38:15 -08:00

texdemo1.c

progs/glsl: use ShadersSupported()

2009-11-17 19:22:29 -07:00

toyball.c

demos/glsl: remove glutInitWindowPosition() calls

2009-08-17 17:13:17 -06:00

toyball.shtest

progs/glsl: add type field to shtest config files

2009-08-13 17:03:56 -06:00

trirast.c

progs/glsl: Fix trirast GLSL compilation errors on Mac OS.

2009-12-02 20:20:12 -08:00

twoside.c

Fix building of GLSL demos which use M_PI

2009-10-05 11:07:23 -06:00

vert-or-frag-only.c

demos/glsl: remove glutInitWindowPosition() calls

2009-08-17 17:13:17 -06:00

vert-tex.c

progs/glsl: change uniform_info::type field to use GLSL vector types

2009-08-12 17:28:45 -06:00