77762801bc
remove some redundant rules from prev merge
2008-11-24 14:31:41 -07:00
df6155fcff
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
progs/glsl/Makefile
2008-11-24 14:08:58 -07:00
80301866f6
added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader
...
Fragment's red/greenb/blue is a function gl_FragCoord.xyz
2008-11-24 13:11:05 -07:00
51af35b7cc
progs: Add ignores
2008-11-24 20:05:47 +01:00
c45c5c4ca4
added progs/demos/fragcoord.c - tests gl_FragCoord attribute in fragment shader
...
Fragment's red/greenb/blue is a function gl_FragCoord.xyz
2008-11-21 10:04:37 -07:00
72ebf4fd03
scons: Build progs.
...
Just demos and trivial dirs for starters.
2008-11-21 10:44:30 +09:00
7468765b18
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/prog_print.c
2008-11-15 16:53:24 +00:00
5e1454a036
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
src/mesa/drivers/dri/common/dri_util.c
2008-11-15 16:23:31 +00:00
d04caf2ce4
trivial: more tests
2008-11-14 18:00:43 +00:00
db20a65a39
mesa: fix build
2008-11-14 14:30:49 +00:00
72bbc89534
Add glsync demo program from jbarnes for testing vblank synchronization.
2008-11-12 13:07:23 -08:00
19e4222f93
Merge commit 'origin/master' into gallium-0.2
...
Conflicts:
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
2008-11-11 14:42:41 -07:00
90246d3ea5
mesa: fix version check in dinoshade.c
2008-11-11 14:35:39 -07:00
90027f8578
CELL: two-sided stencil fixes
...
With these changes, the tests/stencil_twoside test now works.
- Eliminate blending from the stencil_twoside test, as it produces an
unneeded dependency on having blending working
- The spe_splat() function will now work if the register being splatted
and the destination register are the same
- Separate fragment code generated for front-facing and back-facing
fragments. Often these are the same; if two-sided stenciling is on,
they can be different. This is easier and faster than generating
code that does both tests and merges the results.
- Fixed a cut/paste bug where if the back Z-pass stencil operation
were different from all the other operations, the back Z-fail
results were incorrect.
2008-11-11 13:57:10 -07:00
e5359401d6
undo accidental changes to multitex.frag shader
2008-11-10 12:39:36 -07:00
2c204bbf77
use APP_CC, not CC for skinning demo
2008-11-05 17:14:23 -07:00
2382dc8aff
Merge commit 'origin/master' into gallium-0.2
2008-11-05 11:59:12 +00:00
aab429c8df
added glsl/skinning.c test to test matrix blending/weighting
2008-11-04 16:56:59 -07:00
35a9f1bccf
print err msg if unable to open shader file
2008-11-04 16:55:18 -07:00
d3222cb1d4
remove old debug glFlush/Finish calls from demos
2008-11-04 16:55:18 -07:00
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
54d684f23d
move glut.h include
2008-10-28 19:01:38 -06:00
91473dac5a
mesa: use APP_CC compiler in progs/vp/
2008-10-28 19:00:56 -06:00
c25adeae18
mesa: convert log/exp tests to ARB_v_p
2008-10-28 19:00:25 -06:00
0a8590e3cf
mesa: don't continually redraw
2008-10-28 18:18:31 -06:00
61d3a66456
Merge commit 'origin/master' into gallium-0.2
2008-10-27 15:37:22 +00:00
2278107b24
mesa: more test options in progs/demos/textures.c
2008-10-20 17:43:05 -06:00
87a6fe57e8
Merge commit 'origin/gallium-0.1' into gallium-0.2
...
Conflicts:
progs/trivial/tri.c
2008-10-17 14:13:00 -06:00
d422c1eb5c
mesa: redraw upon keypress in trivial/tri.c
2008-10-17 13:37:50 -06:00
893ea47e44
glxswapcontrol: added -fullscreen option
2008-10-16 14:33:27 -06:00
9a84d78c18
glxgears: for fullscreen, disable window borders the right way
2008-10-16 14:33:27 -06:00
b261ed1f61
mesa: revert accidental change to fslight.c demo
2008-10-15 10:54:57 -06:00
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
055d986efe
trivial: more vp tests
2008-10-14 14:18:36 +01:00
5548a3072f
vp: add simple vertex transform test
2008-10-14 14:18:32 +01:00
b3a68b24bd
replace 1.0/sqrt() with inversesqrt()
2008-10-10 12:04:49 -06:00
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
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
f6e806a2b8
mesa: simple multiple textures test
2008-10-09 19:51:26 -06:00
b99c39ea7b
mesa: use the shaderutil.c helper functions
2008-10-07 16:24:43 -06:00
6f29c2ff2d
Progs: hook the glsl identity example into the makefile.
2008-10-07 23:42:36 +02:00
4ccbee2439
Progs: add a trivial glsl test, useful for gallium driver bringup/debug.
2008-10-07 21:21:20 +02:00
1ec78df1e7
trivial: add more vp tests
2008-10-07 19:14:18 +01:00
a381c9e8b3
trivial: exercise vertprog sligtly
2008-10-07 16:33:52 +01:00
d142f216d2
link EGL demos with -lGL
2008-09-26 11:20:20 +01:00
3a40dee3eb
Merge commit 'origin/gallium-0.1' into gallium-0.2
2008-09-21 12:22:21 -07:00
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
866a2c3ccb
mesa: Update ignores a bit
2008-09-19 12:43:47 +02:00
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
a9004cc79c
destroy window on exit
2008-09-18 15:37:13 -06:00
Brian Paul