Alan Hourihane
2382dc8aff
Merge commit 'origin/master' into gallium-0.2
2008-11-05 11:59:12 +00:00
Brian Paul
aab429c8df
added glsl/skinning.c test to test matrix blending/weighting
2008-11-04 16:56:59 -07:00
Brian Paul
35a9f1bccf
print err msg if unable to open shader file
2008-11-04 16:55:18 -07:00
Brian Paul
d3222cb1d4
remove old debug glFlush/Finish calls from demos
2008-11-04 16:55:18 -07:00
Robert Ellison
711f8a1dd9
CELL: stencil bug fixes
...
Two definitive bugs in stenciling were fixed.
The first, reversed registers in the generated Select Bytes (selb)
instruction, caused the stenciling INCR and DECR operations to
fail dramatically, putting new values in where old values were
supposed to be and vice versa.
The second caused stencil tiles to not be read and written from
main memory by the SPUs. A per-spu flag, spu.read_depth, was used
to indicate whether the SPU should be reading depth tiles, and was set
only when depth was enabled. A second flag, spu.read_stencil, was
set when stenciling was enabled, but never referenced.
As stenciling and depth are in the same tiles on the Cell, and there
is no corresponding TAG_WRITE_TILE_STENCIL to complement
TAG_WRITE_TILE_COLOR and TAG_WRITE_TILE_Z, I fixed this by
eliminating the unused "spu.read_stencil", renaming "spu.read_depth"
to "spu.read_depth_stencil", and setting it if either stenciling or
depth is enabled.
I also added an optimization to the fragment ops generation code,
that avoids calculating stencil values and/or stencil writemask
when the stencil operations are all KEEP.
2008-10-30 15:24:52 -06:00
Brian Paul
54d684f23d
move glut.h include
2008-10-28 19:01:38 -06:00
Brian Paul
91473dac5a
mesa: use APP_CC compiler in progs/vp/
2008-10-28 19:00:56 -06:00
Brian Paul
c25adeae18
mesa: convert log/exp tests to ARB_v_p
2008-10-28 19:00:25 -06:00
Brian Paul
0a8590e3cf
mesa: don't continually redraw
2008-10-28 18:18:31 -06:00
Alan Hourihane
61d3a66456
Merge commit 'origin/master' into gallium-0.2
2008-10-27 15:37:22 +00:00
Brian Paul
2278107b24
mesa: more test options in progs/demos/textures.c
2008-10-20 17:43:05 -06:00
Brian Paul
87a6fe57e8
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
progs/trivial/tri.c
2008-10-17 14:13:00 -06:00
Brian Paul
d422c1eb5c
mesa: redraw upon keypress in trivial/tri.c
2008-10-17 13:37:50 -06:00
Brian Paul
893ea47e44
glxswapcontrol: added -fullscreen option
2008-10-16 14:33:27 -06:00
Brian Paul
9a84d78c18
glxgears: for fullscreen, disable window borders the right way
2008-10-16 14:33:27 -06:00
Brian Paul
b261ed1f61
mesa: revert accidental change to fslight.c demo
2008-10-15 10:54:57 -06:00
Keith Whitwell
cf85e413ad
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
src/mesa/main/context.c
2008-10-15 17:20:30 +01:00
Keith Whitwell
055d986efe
trivial: more vp tests
2008-10-14 14:18:36 +01:00
Keith Whitwell
5548a3072f
vp: add simple vertex transform test
2008-10-14 14:18:32 +01:00
Brian Paul
b3a68b24bd
replace 1.0/sqrt() with inversesqrt()
2008-10-10 12:04:49 -06:00
Keith Whitwell
d7f1cb5b5a
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
src/gallium/auxiliary/gallivm/instructionssoa.cpp
src/gallium/auxiliary/gallivm/soabuiltins.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
src/mesa/main/texenvprogram.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/prog_statevars.c
src/mesa/state_tracker/st_draw.c
src/mesa/vbo/vbo_exec_draw.c
2008-10-10 15:23:36 +01:00
Brian Paul
02aea66b1a
mesa: toggle colormask values with r/g/b keys in tri-mask-tri.c
...
Plus misc clean-up.
2008-10-09 19:51:26 -06:00
Brian Paul
f6e806a2b8
mesa: simple multiple textures test
2008-10-09 19:51:26 -06:00
Brian Paul
b99c39ea7b
mesa: use the shaderutil.c helper functions
2008-10-07 16:24:43 -06:00
Stephane Marchesin
6f29c2ff2d
Progs: hook the glsl identity example into the makefile.
2008-10-07 23:42:36 +02:00
Stephane Marchesin
4ccbee2439
Progs: add a trivial glsl test, useful for gallium driver bringup/debug.
2008-10-07 21:21:20 +02:00
Keith Whitwell
1ec78df1e7
trivial: add more vp tests
2008-10-07 19:14:18 +01:00
Keith Whitwell
a381c9e8b3
trivial: exercise vertprog sligtly
2008-10-07 16:33:52 +01:00
Alan Hourihane
d142f216d2
link EGL demos with -lGL
2008-09-26 11:20:20 +01:00
Keith Whitwell
3a40dee3eb
Merge commit 'origin/gallium-0.1' into gallium-0.2
2008-09-21 12:22:21 -07:00
Keith Whitwell
45efcc44c7
Remove CVS keywords.
...
Cherry-picked from gallium-0.1
Conflicts:
src/glu/sgi/libnurbs/interface/bezierEval.h
src/glu/sgi/libnurbs/interface/bezierPatch.h
src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
src/glu/sgi/libnurbs/internals/dataTransform.h
src/glu/sgi/libnurbs/internals/displaymode.h
src/glu/sgi/libnurbs/internals/sorter.h
src/glu/sgi/libnurbs/nurbtess/definitions.h
src/glu/sgi/libnurbs/nurbtess/directedLine.h
src/glu/sgi/libnurbs/nurbtess/gridWrap.h
src/glu/sgi/libnurbs/nurbtess/monoChain.h
src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h
src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
src/glu/sgi/libnurbs/nurbtess/partitionX.h
src/glu/sgi/libnurbs/nurbtess/partitionY.h
src/glu/sgi/libnurbs/nurbtess/polyDBG.h
src/glu/sgi/libnurbs/nurbtess/polyUtil.h
src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
src/glu/sgi/libnurbs/nurbtess/quicksort.h
src/glu/sgi/libnurbs/nurbtess/rectBlock.h
src/glu/sgi/libnurbs/nurbtess/sampleComp.h
src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
src/glu/sgi/libnurbs/nurbtess/sampledLine.h
src/glu/sgi/libnurbs/nurbtess/searchTree.h
src/glu/sgi/libnurbs/nurbtess/zlassert.h
src/glu/sgi/libutil/error.c
src/glu/sgi/libutil/glue.c
src/glu/sgi/libutil/gluint.h
src/glu/sgi/libutil/project.c
src/glu/sgi/libutil/registry.c
src/glx/x11/glxclient.h
src/glx/x11/glxext.c
src/mesa/drivers/dri/ffb/ffb_dd.h
src/mesa/drivers/dri/ffb/ffb_points.h
src/mesa/drivers/dri/gamma/gamma_context.h
src/mesa/drivers/dri/gamma/gamma_macros.h
src/mesa/drivers/dri/i810/i810context.h
src/mesa/drivers/dri/r128/r128_dd.h
src/mesa/drivers/dri/tdfx/tdfx_dd.h
2008-09-21 11:00:44 -07:00
Jakob Bornecrantz
866a2c3ccb
mesa: Update ignores a bit
2008-09-19 12:43:47 +02:00
Robert Ellison
4485ac87c2
CELL: mark several transient files as .gitignore
...
progs/demos: added new demo "fbo_firecube"
progs/glsl: added new demo "pointcoord"
src/gallium/drivers/cell/spu: added the g3d_spu executable, a Cell SPU
executable file, which seems to be occasionally built as part of the
cell driver
src/glu/sgi: added "exptmp", a byproduct of the "mklib" process that
sometimes gets deleted and sometimes not.
2008-09-18 16:36:37 -06:00
Brian Paul
a9004cc79c
destroy window on exit
2008-09-18 15:37:13 -06:00
Keith Whitwell
a8d1521f30
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
src/mesa/shader/slang/slang_link.c
2008-09-18 19:07:33 +01:00
Keith Whitwell
89ab66448e
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/trivial/Makefile
src/mesa/glapi/glthread.c
2008-09-18 19:03:02 +01:00
Jakob Bornecrantz
fa7529335c
progs/fp: Add a bit of local variable testing to fp-tri
2008-09-18 14:14:56 +02:00
Brian Paul
3b3d34d637
egl: print multisample info
2008-09-17 15:29:59 -06:00
Brian Paul
05aeb92a09
cell: dump generated code if CELL_DEBUG=asm
2008-09-17 08:14:09 -06:00
Keith Whitwell
a30d2c5727
add dlist-degenerate test case
2008-09-15 13:49:04 +01:00
Brian Paul
870afb8319
negate.txt - test negation of a src reg
2008-09-13 15:33:07 -06:00
Guillaume Melquiond
5d4c8ec5e0
remove invalid XDestroyWindow() call
2008-09-13 14:22:15 -06:00
Guillaume Melquiond
ee2c8d6d3e
silence warning
2008-09-13 14:21:50 -06:00
Jonathan White
272810125b
Makefile was previously checked in with merge diffs still present. I just selected HEAD and removed the old.
2008-09-12 13:25:40 -06:00
Brian Paul
c436f96b10
simple add with swizzle and mul with swizzle tests
2008-09-12 08:40:50 -06:00
Keith Whitwell
522139dd14
vp: add run script
2008-09-12 10:31:51 +01:00
Keith Whitwell
176c454765
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
progs/fp/Makefile
2008-09-12 10:31:23 +01:00
Keith Whitwell
1f13545679
fp: put test name in window title, add run script
2008-09-12 10:28:36 +01:00
Keith Whitwell
52a9dfd4fe
use APP_CC, remove redundant target
2008-09-12 10:02:16 +01:00
Brian Paul
dbbbc33344
use APP_CC
2008-09-11 17:55:53 -06:00
