xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_exa_render.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cd77ec18f32a7b36acb655c927bbfd7044019f97
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Mar 24 18:42:21 2008 +1000

    r300: don't bother with VAP/TCL for render.
    
    We just send more data to the card to process per transaction, without getting
    any actual gains, as we already pre-compute the vertices without needing
    any clipping or transforms from the card.
    
    Perhaps some stuff could be done on-card, but so far the code is a lot
    faster if we avoid sending this extra info.
    
    pre: 150000 glyphs/sec
    post: 185000 glyphs/sec

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 707e9fc..d968dc8 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1036,10 +1036,10 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
     CARD32 txenable, colorpitch;
     CARD32 blendcntl;
     int pixel_shift;
-    int has_tcl = ((info->ChipFamily != CHIP_FAMILY_RS690) &&
+    int has_tcl = 0; /*((info->ChipFamily != CHIP_FAMILY_RS690) &&
 		   (info->ChipFamily != CHIP_FAMILY_RS740) &&
 		   (info->ChipFamily != CHIP_FAMILY_RS400) &&
-		   (info->ChipFamily != CHIP_FAMILY_RV515));
+		   (info->ChipFamily != CHIP_FAMILY_RV515)); */
     ACCEL_PREAMBLE();
 
     TRACE;