(file) Return to r128_video.c CVS log (file) (dir) Up to [XFree86 CVS] / xc / programs / Xserver / hw / xfree86 / drivers / ati

Diff for /xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c between version 1.2 and 1.3

version 1.2, 2000/11/09 03:24:36 version 1.3, 2000/11/18 19:37:11
Line 1 
Line 1 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c,v 1.1 2000/11/02 16:55:39 tsi Exp $ */  /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c,v 1.2 2000/11/09 03:24:36 martin Exp $ */
 /* /*
  * Copyright 2000 Stuart R. Anderson and Metro Link, Inc.  * Copyright 2000 Stuart R. Anderson and Metro Link, Inc.
  *  *
Line 41 
Line 41 
  *   My apologies to Vladimir as there is more good work in his code that  *   My apologies to Vladimir as there is more good work in his code that
  *   should be brought forward.  *   should be brought forward.
  */  */
 #include "xf86.h"  
 #include "xf86_OSproc.h"  
 #include "xf86Resources.h"  
 #include "xf86_ansic.h"  
 #include "compiler.h"  
 #include "xf86PciInfo.h"  
 #include "xf86Pci.h"  
 #include "xf86fbman.h"  
 #include "regionstr.h"  
   
 #include "xf86xv.h"  
 #include "xf86Cursor.h"  
 #include "Xv.h"  
 #include "xaalocal.h"  
 #include "dixstruct.h"  
 #include "fourcc.h"  
 #ifdef XF86DRI  
 #include "r128_dri.h"  
 #endif  
  
 #include "r128.h" #include "r128.h"
 #include "r128_reg.h" #include "r128_reg.h"
  
 /*  #include "xf86.h"
  * For Debug  
 #define OUTREG(addr, val)   { xf86DrvMsgVerb(pScrn->scrnIndex,X_INFO,1,"OUTREG(%s,%x)\n",#addr,val) ;MMIO_OUT32(R128MMIO, addr, val);}  #include "Xv.h"
 */  #include "fourcc.h"
  
 #define OFF_DELAY       250  /* milliseconds */ #define OFF_DELAY       250  /* milliseconds */
 #define FREE_DELAY      15000 #define FREE_DELAY      15000
Line 727 
Line 708 
     if(!RegionsEqual(&pPriv->clip, clipBoxes)) {     if(!RegionsEqual(&pPriv->clip, clipBoxes)) {
         REGION_COPY(pScreen, &pPriv->clip, clipBoxes);         REGION_COPY(pScreen, &pPriv->clip, clipBoxes);
         /* draw these */         /* draw these */
         XAAFillSolidRects(pScrn, pPriv->colorKey, GXcopy, ~0,          (*info->accel->FillSolidRects)(pScrn, pPriv->colorKey, GXcopy, ~0,
                                         REGION_NUM_RECTS(clipBoxes),                                         REGION_NUM_RECTS(clipBoxes),
                                         REGION_RECTS(clipBoxes));                                         REGION_RECTS(clipBoxes));
     }     }


Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

Powered by
ViewCVS 0.9.2