Ian Romanick 8fc433fa0f Merge branch 'mesa_7_6_branch' into mesa_7_7_branch ...

Conflicts:
	progs/demos/projtex.c
	progs/xdemos/glxinfo.c
	src/mesa/main/version.h

To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch.  The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.

2009-12-07 17:16:10 -08:00

..

.gitignore

mesa: Update ignores a bit

2008-09-19 12:43:47 +02:00

abs.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

add-sat.txt

tgsi: implement saturation

2009-09-12 18:33:46 -07:00

add-swz.txt

simple add with swizzle and mul with swizzle tests

2008-09-12 08:40:50 -06:00

add.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

cmp.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

cos.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

dp3.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

dp4.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

dph.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

dst.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

ex2.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

flr.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

fp-tri.c

progs/fp: Redraw upon keypress.

2009-12-03 15:59:56 -08:00

frc.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

kil-pos.txt

progs/fp: pass texcoord to triangle, add a test shader

2009-03-23 18:39:36 +00:00

kil-texcoord-sgt.txt

progs/fp: pass texcoord to triangle, add a test shader

2009-03-23 18:39:36 +00:00

kil.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

lg2.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

lit.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

local.txt

progs/fp: Add a bit of local variable testing to fp-tri

2008-09-18 14:14:56 +02:00

lrp.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

mad.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

Makefile

progs/fp: Add tri-inv.c to Makefile.

2009-12-04 17:29:53 -08:00

max.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

min.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

mov-alias.txt

tgsi: handle some src/dst aliasing in tgsi_sse2.c

2009-09-13 11:59:24 -07:00

mov.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

mul-alias.txt

tgsi: handle some src/dst aliasing in tgsi_sse2.c

2009-09-13 11:59:24 -07:00

mul-swz.txt

simple add with swizzle and mul with swizzle tests

2008-09-12 08:40:50 -06:00

mul.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

negate.txt

negate.txt - test negation of a src reg

2008-09-13 15:33:07 -06:00

point-position.c

progs/fp: Redraw upon keypress.

2009-12-03 15:59:56 -08:00

position.txt

fp: dont reference fragment.position.zw

2009-03-06 21:00:18 +00:00

pow.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

rcp.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

rsq.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

run.sh

fp: put test name in window title, add run script

2008-09-12 10:28:36 +01:00

SConscript

progs: Port fp programs to GLEW.

2009-06-11 13:19:34 +01:00

scs.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

sge2.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

sge.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

sin.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

slt.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

sub.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

swz2.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

swz3.txt

tests: another extended swizzle test

2009-04-15 19:55:28 -06:00

swz.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00

tex-pos-kil-1.txt

fp: enable a second texture unit and add a kil test for it

2009-03-09 14:08:52 +00:00

tex-pos-kil.txt

fp: add some more texture, position and kill tests

2009-03-06 21:15:19 +00:00

tex-pos.txt

fp: add some more texture, position and kill tests

2009-03-06 21:15:19 +00:00

tex.txt

fp: add some more texture, position and kill tests

2009-03-06 21:15:19 +00:00

tri-depth2.c

progs/fp: Redraw upon keypress.

2009-12-03 15:59:56 -08:00

tri-depth.c

progs/fp: Redraw upon keypress.

2009-12-03 15:59:56 -08:00

tri-depthwrite2.c

progs/fp: Redraw upon keypress.

2009-12-03 15:59:56 -08:00

tri-depthwrite.c

progs/fp: Redraw upon keypress.

2009-12-03 15:59:56 -08:00

tri-inv.c

progs/fp: Redraw upon keypress.

2009-12-04 23:31:39 -08:00

tri-param.c

progs/fp: Redraw upon keypress.

2009-12-03 15:59:56 -08:00

tri-tex.c

progs/fp: Redraw upon keypress.

2009-12-03 15:59:56 -08:00

xpd.txt

Redo the fragment program examples to match vp's

2007-12-11 09:49:34 -05:00