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

Diff for /xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c between version 1.14 and 1.15

version 1.14, 2000/03/28 01:21:05 version 1.15, 2001/10/28 03:34:04
Line 1 
Line 1 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.11 1999/05/03 12:16:07 dawes Exp $ */  /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */
  
 #include "misc.h" #include "misc.h"
 #include "xf86.h" #include "xf86.h"
Line 181 
Line 181 
       pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);       pPriv = XAA_GET_PIXMAP_PRIVATE(pGC->tile.pixmap);
       fg = pPriv->fg;  bg = pPriv->bg;       fg = pPriv->fg;  bg = pPriv->bg;
       break;       break;
      default:     /* Muffle compiler */
         pPriv = NULL;     /* Kaboom */
         fg = -1;  bg = -1;
         break;
    }    }
  
    (*infoRec->FillMono8x8PatternSpans) (infoRec->pScrn,    (*infoRec->FillMono8x8PatternSpans) (infoRec->pScrn,
Line 206 
Line 210 
 ){ ){
    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
    XAACacheInfoPtr pCache;    XAACacheInfoPtr pCache;
    XAAPixmapPtr pPriv;  
    PixmapPtr pPix;    PixmapPtr pPix;
    int fg, bg;    int fg, bg;
  
    switch(pGC->fillStyle) {    switch(pGC->fillStyle) {
    case FillStippled:    case FillStippled:
       pPix = pGC->stipple;       pPix = pGC->stipple;
       pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);  
       fg = pGC->fgPixel;  bg = -1;       fg = pGC->fgPixel;  bg = -1;
       break;       break;
    case FillOpaqueStippled:    case FillOpaqueStippled:
       pPix = pGC->stipple;       pPix = pGC->stipple;
       pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);  
       fg = pGC->fgPixel;  bg = pGC->bgPixel;       fg = pGC->fgPixel;  bg = pGC->bgPixel;
       break;       break;
    case FillTiled:    case FillTiled:
       pPix = pGC->tile.pixmap;       pPix = pGC->tile.pixmap;
       pPriv = XAA_GET_PIXMAP_PRIVATE(pPix);        fg = -1;  bg = -1;
         break;
      default:     /* Muffle compiler */
         pPix = NULL;
       fg = -1;  bg = -1;       fg = -1;  bg = -1;
       break;       break;
    }    }
Line 260 
Line 264 
    case FillOpaqueStippled:    case FillOpaqueStippled:
       fg = pGC->fgPixel;  bg = pGC->bgPixel;       fg = pGC->fgPixel;  bg = pGC->bgPixel;
       break;       break;
      default:     /* Muffle compiler */
         fg = -1;  bg = -1;
         break;
    }    }
  
    (*infoRec->FillColorExpandSpans) (infoRec->pScrn, fg, bg,    (*infoRec->FillColorExpandSpans) (infoRec->pScrn, fg, bg,
Line 299 
Line 306 
    case FillTiled:    case FillTiled:
       pCache = (*infoRec->CacheTile)(infoRec->pScrn, pGC->tile.pixmap);       pCache = (*infoRec->CacheTile)(infoRec->pScrn, pGC->tile.pixmap);
       break;       break;
      default:     /* Muffle compiler */
         pCache = NULL;
         break;
    }    }
  
    (*infoRec->FillCacheBltSpans) (infoRec->pScrn,    (*infoRec->FillCacheBltSpans) (infoRec->pScrn,
Line 332 
Line 342 
    case FillOpaqueStippled:    case FillOpaqueStippled:
       fg = pGC->fgPixel;  bg = pGC->bgPixel;       fg = pGC->fgPixel;  bg = pGC->bgPixel;
       break;       break;
      default:     /* Muffle compiler */
         fg = -1;  bg = -1;
         break;
    }    }
  
    (*infoRec->FillCacheExpandSpans) (infoRec->pScrn, fg, bg,    (*infoRec->FillCacheExpandSpans) (infoRec->pScrn, fg, bg,
Line 490 
Line 503 
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn);
     int patx = pattern0, paty = pattern1;     int patx = pattern0, paty = pattern1;
     int xorg, yorg, slot;     int xorg, yorg, slot;
     XAACacheInfoPtr pCache;      XAACacheInfoPtr pCache = NULL;
  
  
     if(!(infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS)){     if(!(infoRec->Mono8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_BITS)){

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15
Powered by
ViewCVS 0.9.2