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

..

.gitignore

progs: Ignores

2009-01-21 15:01:13 +01:00

bitmap.c

Replace duplicated code with new shaderutil.c functions

2008-04-09 22:30:42 -06:00

brick.c

remove .txt suffix from shader source files

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

bump.c

remove old debug glFlush/Finish calls from demos

2008-11-04 16:55:18 -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-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

remove .txt suffix from shader source files

2008-08-16 09:36:46 -06: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

Merge commit 'origin/master' into gallium-0.2

2008-11-05 11:59:12 +00:00

cubemap.frag

remove .txt suffix from shader source files

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

deriv.c

Replace duplicated code with new shaderutil.c functions

2008-04-09 22:30:42 -06:00

fragcoord.c

added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader

2008-11-24 13:11:05 -07:00

identity.c

mesa: don't continually redraw

2008-10-28 18:18:31 -06:00

Makefile

mesa: add new samplers_array test

2009-01-14 17:01:16 +00:00

mandelbrot.c

remove old debug glFlush/Finish calls from demos

2008-11-04 16:55:18 -07:00

multinoise.c

Fix silly type mismatch error in multinoise demo.

2008-12-13 20:06:21 -07:00

multitex.c

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

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

multitex.frag

undo accidental changes to multitex.frag shader

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

multitex.vert

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

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

noise.c

Ensure p.w is initialised in noise demo.

2008-12-13 14:25:52 -07:00

pointcoord.c

mesa: added new glsl/pointcoord.c test

2008-08-13 08:49:39 -06:00

points.c

Replace duplicated code with new shaderutil.c functions

2008-04-09 22:30:42 -06:00

reflect.vert

remove .txt suffix from shader source files

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

samplers.c

mesa: add new samplers_array test

2009-01-14 17:01:16 +00:00

shadowtex.frag

remove .txt suffix from shader source files

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

simple.vert

remove .txt suffix from shader source files

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

skinning.c

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

2008-11-04 16:56:59 -07: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

texdemo1.c

Merge branch 'gallium-0.1' into gallium-0.2

2008-09-11 16:05:15 +01:00

toyball.c

remove old debug glFlush/Finish calls from demos

2008-11-04 16:55:18 -07:00

trirast.c

use ftransform()

2008-08-20 15:33:03 -06:00

twoside.c

demos: minor fixes to twoside.c glsl demo

2008-12-30 07:24:19 -07:00

vert-or-frag-only.c

demos: add test of vertex-only and fragment-only shader programs

2008-12-18 14:17:06 -07:00

vert-tex.c

demos: added simple vertex shader texture test.

2008-12-03 18:55:25 -07:00