Eric Anholt
4fe48b4e85
Merge branch 'origin' into i915-unification
2007-06-21 14:14:24 -07:00
Eric Anholt
5d9dc02cbe
Reset saved state for disasm when we've lost the context.
2007-06-21 12:57:15 -07:00
Eric Anholt
f3f29d632e
Add decoding of inline primitives in debug output.
2007-06-21 12:53:07 -07:00
Eric Anholt
f972f58d80
Improve fake bufmgr debugging, and don't try to migrate static buffers.
2007-06-21 11:44:48 -07:00
Eric Anholt
1a49cd7f5b
Add missing i915_disasm.h header and adjust copyright formatting on the .c
2007-06-21 10:01:34 -07:00
Oliver McFadden
ed5ed6fe2f
r300: Corrected a bug in r300LineWidth.
...
Thanks to Panagiotis Papadakos for reporting it.
2007-06-21 15:53:26 +00:00
Brian
171dcdfa27
Another round of fixing attribute interpolation for glDraw/CopyPixels.
...
Need to turn off FRAG_BIT_COL0 in swrast->_ActiveAttribMask when doing
glRead/CopyPixels to prevent the user's colors from getting overwritten
when a fragment program is active.
This was happening in the DRI drivers when MaintainTexEnv program was
used (the texenv fragment program was enabled when _swrast_DrawPixels was
called).
This still isn't an ideal solution, but fixes things for now.
2007-06-21 09:15:32 -06:00
Brian
fe11b2c04b
rename _swrast_update_fragment_attribs()
2007-06-21 09:11:43 -06:00
Dave Airlie
41d28d97f5
clean up color0 code
2007-06-21 18:35:25 +10:00
Dave Airlie
36235e5ff1
add a mem use for current dma buffer
2007-06-21 18:35:00 +10:00
Dave Airlie
faab84cfa6
fix unfilled tris/quads
2007-06-21 15:07:31 +10:00
Dave Airlie
d3ef71166d
ensure cmd buffer space
2007-06-21 14:43:53 +10:00
Dave Airlie
d1be4ab80f
fix up vertex emission before state change
2007-06-21 14:20:33 +10:00
Dave Airlie
025efae411
fix secondary color, fog is off for now
2007-06-21 10:59:11 +10:00
Dave Airlie
6d8a4312ed
fix projtex
2007-06-21 10:50:27 +10:00
Dave Airlie
ad8abf7147
fix quad-clip
2007-06-21 10:32:39 +10:00
Dave Airlie
08fb0bad72
bring over vertex engine setup code from r300_Render and fix up
...
now have gears going.. + a few other trivial textured demoes
2007-06-21 10:19:00 +10:00
Brian
f9c17ec58a
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
2007-06-20 11:01:09 -06:00
Brian
a4af3e5ab3
Effectively disable _TexEnvProgram before calling _swrast_DrawPixels().
...
It's OK to use _TexEnvProgram regardless of the texture state, but if fog
is also enabled, the fragment program is lacking the actual fog computation
so fogging doesn't appear.
Fixing this might involve a new _MaintainFogProgram field and related code.
For now, just disable the _TexEnvProgram and let swrast handle everything.
2007-06-20 11:01:04 -06:00
Brian
b9080dd549
fix glDrawPixels + fragment program problem
2007-06-20 10:56:13 -06:00
Brian
c1cb541233
copy wpos attrib info into zoomed span (fixes fog perspective correction problem)
2007-06-20 10:55:31 -06:00
Dave Airlie
d7777f4598
fixup some bits of tcl path
2007-06-20 18:02:08 +10:00
Dave Airlie
2a6082b531
swtcl: gears works
2007-06-20 18:01:47 +10:00
Brian
bd8eeb7ed0
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
2007-06-19 18:50:26 -06:00
Eric Anholt
bf0ae055de
Fix TTM static allocation flags.
2007-06-18 12:20:07 -07:00
Eric Anholt
1ddbfd779b
Test for TTM presence initially rather than test for lack of classic aperture.
2007-06-18 12:19:42 -07:00
Dave Airlie
4a841b969a
more commits to fix things and stuff - still not doing anything except crashin
2007-06-17 19:55:13 +10:00
Dave Airlie
492bc67df1
swtcl add debug and fix offset
2007-06-17 15:44:42 +10:00
Dave Airlie
780ae9f17d
cleaned up reduced prim
2007-06-17 15:05:43 +10:00
Dave Airlie
3b8cf84aa5
fixup packet setup - still hangs
2007-06-17 14:47:09 +10:00
Dave Airlie
aaf76906e8
add missing swtcl file
2007-06-17 14:27:58 +10:00
Dave Airlie
d42888dac3
add more swtcl code to r300 - hangs card now
2007-06-17 14:17:11 +10:00
Eric Anholt
2754ac0878
Replace intel_dump_batchbuffer with a more informational version.
2007-06-15 16:58:15 -07:00
Eric Anholt
7a452b21a2
Correct a mis-count in a LOAD_STATE_IMMEDIATE_1 length argument.
2007-06-15 16:20:34 -07:00
Michel Dänzer
9cde7fb61d
i915tex: Missing piece of SetTexOffset hook implementation for I830 generation.
2007-06-15 15:24:35 +02:00
Dave Airlie
bc81885bb2
Initial r300 modes for swtcl it compiles!!
2007-06-14 15:26:39 +10:00
Stephane Marchesin
f6963f57d9
nouveau: remove useless viewport xform with id matrix.
2007-06-14 00:44:16 +02:00
Dave Airlie
40cc47f8ee
move clip to r300 emit
2007-06-13 12:56:48 +10:00
Brian
144e1e439f
fix an error string, refactor _mesa_GetCompressedTexImageARB() to get rid of a goto
2007-06-12 17:17:43 -06:00
Brian
261ed74074
fix make clean commands so missing subdirs don't cause infinite loops
2007-06-12 17:06:27 -06:00
Brian
d70fa021d5
added memcpy() to-do item
2007-06-12 15:16:21 -06:00
Brian
ef82f004fa
fix comment
2007-06-12 15:08:43 -06:00
Brian
edf07417be
Fix TEXREL issues when using GLX_USE_TLS (see bug 7459).
2007-06-12 09:47:03 -06:00
Brian
c1ba308e64
fix GLX_USE_TLS breakage, fix a warning
2007-06-12 08:57:12 -06:00
Brian
0fbc4c51a0
Rework _mesa_update_texture_compare_function() to only be called during
...
state validation/update.
Note that we're still temporarily skipping the test for an active fragment
program. Need to fix shadow2D() ...
2007-06-11 17:16:18 -06:00
Brian
495e2c8327
rename/clean-up _mesa_validate_texture_wrap_mode
2007-06-11 16:42:35 -06:00
Brian
84e051b6a0
fix typo, added comment
2007-06-11 16:36:06 -06:00
Brian
227315278d
Replace texobj->Complete with texobj->_Complete since it's a derived field.
2007-06-11 16:32:57 -06:00
Brian
a28977a4c7
typo: s/derrived/derived/
2007-06-11 16:27:33 -06:00
Brian
0186f1bc83
Temporarily disable the calls to _mesa_update_texture_compare_function().
...
This fixes the depth-peel regression reported by Brad King.
2007-06-11 16:04:36 -06:00
