Commit graph

27825 commits

Author SHA1 Message Date
Corbin Simpson
1c181a7eff r300g: Begin separating HW TCL and SW TCL state and setup.
This patch removes draw_context entirely from the HW TCL path and cleans up
a few other things along the way. Hopefully, nothing got broken.

Thanks to Marek Olšák for testing, review, and pointing out my bugs. :3
2009-11-20 17:48:10 -08:00
Marek Olšák
015e7e7724 r300g: emit R300_TEX_ENABLE to indicate there are no textures bound
Previously, this reg wasn't emitted at all if texture_count == 0.
2009-11-20 15:12:18 -08:00
Marek Olšák
ae70cd1f02 r300g: remove variant states from emit_state_invariant 2009-11-20 15:08:52 -08:00
Corbin Simpson
6a95996abb r300g: Texrect factor cleanup.
(0, 0, 0, 1) is a much saner default value, and texrect factors only need
to be (1/s, 1/t, 0, 1).
2009-11-20 14:56:13 -08:00
Marek Olšák
f4041b37e2 r300g: fix rectangle textures on r3xx
Adapted from Maciej Cencora's patch.
2009-11-20 14:47:31 -08:00
Corbin Simpson
06ec216d19 r300g: Clean up bitcounting function.
I didn't see this in u_math; surely somebody else has this wheel
reinvented elsewhere.
2009-11-20 14:10:59 -08:00
Corbin Simpson
6a3eb1f91b r300g: Use MAX3 and MIN3. 2009-11-20 14:10:45 -08:00
Corbin Simpson
37ba97421c util: Add MAX3 and MIN3. 2009-11-20 14:08:58 -08:00
Marek Olšák
beea241374 r300g: set better values in the R300_VAP_CNTL register 2009-11-20 13:33:37 -08:00
Alan Hourihane
0295edf596 Fix comment to use /* */ rather than // 2009-11-20 18:11:30 +00:00
Alan Hourihane
904469dcd2 Fix indentation. 2009-11-20 18:10:54 +00:00
Alan Hourihane
8f648cd3e4 Fix vega compilation. 2009-11-20 18:09:10 +00:00
Alan Hourihane
a24631bcd7 Fix memory leak. 2009-11-20 18:08:29 +00:00
Richard Li
08e5d1ecad r600 : eliminate Wondows line ending for test code. 2009-11-20 11:03:09 -05:00
Dave Airlie
3f2c77659c Merge remote branch 'origin/mesa_7_7_branch' 2009-11-20 11:48:10 +10:00
Dave Airlie
f8ea531820 r100: fix texture_from_pixmap and compiz.
r100 state emission has separate rect and non-rect states,
if we are doing TFP for a TEXTURE_2D we shouldn't use the rect
states as they won't get emitted properly.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-11-20 11:47:00 +10:00
Richard Li
b09e74901a r600 : Clean up a bit test code mess. 2009-11-19 17:41:10 -05:00
Vinson Lee
8b808d50e2 st/xorg: Fix infinite loop in copy_packed_data. 2009-11-19 14:40:00 -08:00
Vinson Lee
4ab8dbe593 progs/xdemos: Add missing break statement in offset.c. 2009-11-19 14:20:26 -08:00
Brian Paul
4e6c79ac16 st/mesa: replace st_flush() with pipe->flush()
We only need to flush the gallium driver in this case.
Fixes a recursive state validation bug.
2009-11-19 15:18:23 -07:00
Brian Paul
2198497203 vbo: added recursion check in vbo_exec_FlushVertices() 2009-11-19 15:17:56 -07:00
Richard Li
48dfd3938e r600 : change shader pop method for now. 2009-11-19 16:55:16 -05:00
Brian Paul
dc41d62250 st/mesa: get rid of compressed_num_bytes() code 2009-11-19 14:35:38 -07:00
Brian Paul
92863109af st/mesa: remove is_compressed_mesa_format() 2009-11-19 14:17:31 -07:00
Brian Paul
273f4d6b5f st/mesa: remove pointless assertion 2009-11-19 14:17:31 -07:00
Brian Paul
3f40166500 softpipe: whitespace/indentation fixes 2009-11-19 14:17:31 -07:00
Richard Li
49b3f4a6bc Merge branch 'master' of ssh://richardradeon@git.freedesktop.org/git/mesa/mesa 2009-11-19 16:17:13 -05:00
Richard Li
6345a7ba44 r600 : check in shader code test enable flag: if flag
R600_ENABLE_GLSL_TEST defined, IL shader code will goto r600 assembler.
The test base is /mesa/progs/glsl/brick, and changes
shader code in CH06-brick.frag/vert to test different logic op
combination. (if,else,while,function,...). The stack depth code is not
in yet, so it is hard coded now. So complex code would not run (such as
things like 8 loops embeded loop in loop).
2009-11-19 16:05:43 -05:00
Vinson Lee
3790c6a13b progs/trivial: Redraw upon keypress. 2009-11-19 13:03:12 -08:00
José Fonseca
90e69c81e4 pb: Make fenced buffers threadsafe. 2009-11-19 19:46:21 +00:00
Brian Paul
367cfca808 softpipe: add missing check in softpipe_is_texture_referenced()
Check if the named texture is referenced by the texture cache.
2009-11-19 11:39:24 -07:00
Michel Dänzer
31ea323b4d st/xorg: Replace compile-time acceleration switch with Option "2DAccel".
This option can be used to disable 2D acceleration. DRI2 and XVideo blits will
still be accelerated, at least to some degree even with compositing.
2009-11-19 17:52:55 +01:00
Michel Dänzer
10c67f9381 st/xorg: Miscellaneous XVideo fixes.
* Make sure the destination pixmap has a texture to render into.
* Fix damage reporting so the EXA migration code can do the right thing.
* Fix destination coordinates for redirected windows.
2009-11-19 17:47:21 +01:00
Michel Dänzer
34145fc3b7 st/xorg: Try harder to ensure a shared texture has valid contents right away. 2009-11-19 17:30:32 +01:00
Michel Dänzer
012d0193cc st/xorg: Don't complain about convolution filter being 'unknown'.
Also add a newline to the complaint so it'll be a little less annoying if we
actually encounter an unknown filter value again.
2009-11-19 17:25:05 +01:00
Eric Anholt
827ba44f6e intel: Remove non-GEM support.
This really isn't supported at this point.  GEM's been in the kernel for
a year, and the fake bufmgr never really worked.
2009-11-19 11:47:22 +01:00
Eric Anholt
667760f53c intel: Remove dead intel_context members and move some packing around. 2009-11-19 11:47:21 +01:00
Eric Anholt
ee64347979 intel: Remove our special color packing macros and just use colormac.h. 2009-11-19 11:47:21 +01:00
Eric Anholt
c4b7c47fe3 intel: Pack colors for blit at blit time, rather than at ClearColor. 2009-11-19 11:47:21 +01:00
Eric Anholt
a376e5c482 intel: Consistently use no_batch_wrap in intel_context struct. 2009-11-19 11:47:21 +01:00
Eric Anholt
edd449fb97 i965: Pack brw_wm_fragment_program better. 2009-11-19 11:47:21 +01:00
Eric Anholt
15fa484f51 mesa: Remove gratuitous padding in prog_dst_register.
The padding was there to indicate the amount of space left from the
number of expected bytes in the struct minus allocated bits.  But
uint bitfields get packed so that they don't cross uint boundaries, and we
ended up allocating an extra dword to hold the pad field!
2009-11-19 11:47:21 +01:00
Eric Anholt
92d35b91f1 i965: Pack the brw_wm_prog_key better. 2009-11-19 11:47:21 +01:00
Eric Anholt
cc39fcad89 i915: Remove dead meta_draw_quad code. 2009-11-19 11:47:05 +01:00
Eric Anholt
37c79d4d76 tnl: Replace deprecated FogCoordPtr with AttribPtr[_TNL_ATTRIB_FOG] 2009-11-19 11:47:05 +01:00
Eric Anholt
0a91878015 tnl: Replace deprecated ColorPtr[] with AttribPtr or new BackfaceColorPtr. 2009-11-19 11:47:05 +01:00
Eric Anholt
fc9a2970dc tnl: Replace deprecated IndexPtr[] with AttribPtr[] or new BackfaceIndexPtr 2009-11-19 11:47:05 +01:00
Eric Anholt
165b860da6 tnl: Replace deprecated ObjPtr with AttribPtr[_TNL_ATTRIB_POS] 2009-11-19 11:47:05 +01:00
Eric Anholt
df582ca767 tnl: Replace deprecated TexCoordPtr with AttribPtr[_TNL_ATTRIB_TEX*] 2009-11-19 11:47:05 +01:00
Eric Anholt
22bcb59a95 tnl: Replace NormalPtr with AttribPtr[_TNL_ATTRIB_NORMAL] 2009-11-19 11:47:04 +01:00