Commit graph

1206 commits

Author SHA1 Message Date
Brian Paul
b0caa10a85 Merge commit 'origin/master' into gallium-0.2 2008-12-16 15:50:14 -07:00
Brian Paul
b8bfddf976 demos: updated tests/floattex.c (doesn't work just yet). 2008-12-15 18:19:05 -07:00
Alan Hourihane
a22d865f93 Merge commit 'origin/master' into gallium-0.2 2008-12-15 11:16:03 +00:00
Gary Wong
a42342cd90 Fix silly type mismatch error in multinoise demo. 2008-12-13 20:06:21 -07:00
Gary Wong
d427a2910f Add "multinoise" demo, to test 1/2/3/4 dimensional noise. 2008-12-13 14:28:04 -07:00
Gary Wong
0df3dfab82 Ensure p.w is initialised in noise demo. 2008-12-13 14:25:52 -07:00
Brian Paul
0c31661e73 Merge commit 'origin/gallium-0.1' into gallium-0.2 2008-12-10 18:11:31 -07:00
Keith Whitwell
e1645313be mesa: more trivial tests 2008-12-10 12:53:17 +00:00
Alan Hourihane
e8a1b31ddf fix conflict breakage 2008-12-08 15:03:29 +00:00
Alan Hourihane
33a1f495d4 Merge commit 'origin/master' into gallium-0.2
Conflicts:

	progs/glsl/Makefile
2008-12-08 14:29:50 +00:00
Brian
39091cc638 demos: added simple vertex shader texture test.
Draw a quadmesh where Z coord is taken from a texture map.
2008-12-03 18:55:25 -07:00
Younes Manton
25eee19cd6 mesa: Update some .gitignore files. 2008-12-02 16:15:13 -05:00
Alan Hourihane
c4c86bbd16 Merge commit 'origin/master' into gallium-0.2 2008-11-28 16:19:10 +00:00
Brian Paul
e23122d309 demos: press SPACE to toggle fbo_firecube animation 2008-11-26 09:00:44 -07:00
Brian Paul
77762801bc remove some redundant rules from prev merge 2008-11-24 14:31:41 -07:00
Brian Paul
df6155fcff Merge commit 'origin/master' into gallium-0.2
Conflicts:

	progs/glsl/Makefile
2008-11-24 14:08:58 -07:00
Brian Paul
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
Jakob Bornecrantz
51af35b7cc progs: Add ignores 2008-11-24 20:05:47 +01:00
Brian Paul
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
José Fonseca
72ebf4fd03 scons: Build progs.
Just demos and trivial dirs for starters.
2008-11-21 10:44:30 +09:00
Keith Whitwell
7468765b18 Merge commit 'origin/master' into gallium-0.2
Conflicts:

	src/mesa/shader/prog_print.c
2008-11-15 16:53:24 +00:00
Keith Whitwell
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
Keith Whitwell
d04caf2ce4 trivial: more tests 2008-11-14 18:00:43 +00:00
Alan Hourihane
db20a65a39 mesa: fix build 2008-11-14 14:30:49 +00:00
Eric Anholt
72bbc89534 Add glsync demo program from jbarnes for testing vblank synchronization. 2008-11-12 13:07:23 -08:00
Brian Paul
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
Brian Paul
90246d3ea5 mesa: fix version check in dinoshade.c 2008-11-11 14:35:39 -07:00
Robert Ellison
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
Brian Paul
e5359401d6 undo accidental changes to multitex.frag shader 2008-11-10 12:39:36 -07:00
Brian Paul
2c204bbf77 use APP_CC, not CC for skinning demo 2008-11-05 17:14:23 -07:00
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