xserver/hw/kdrive/src kaa.c,1.28,1.29 kaapict.c,1.9,1.10

[Eric Anholt]

Committed by: anholt

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/home/anholt/xserver/hw/kdrive/src

Modified Files:
	kaa.c kaapict.c 
Log Message:
- Pass the right pixel mask (all ones) in to PrepareSolid in the
  solid-fill-based composite acceleration.
- Use a real pixmap when doing an UploadToScratch (For pDrawable->type
  == DRAWABLE_WINDOW, you need to get the backing pixmap).
- Pass back the x/y offsets from kaaGetOffscreenPixmap
  unconditionally, because they'll be used in the scratch case.
- Turn on the Render acceleration for Rage 128 and Radeon 100-series at
  last!


Index: kaa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaa.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- kaa.c	20 May 2004 05:27:03 -0000	1.28
+++ kaa.c	10 Jun 2004 19:22:58 -0000	1.29
@@ -336,13 +336,12 @@
 	x = 0;
 	y = 0;
     }
+    *xp = x;
+    *yp = y;
     if (kaaPixmapIsOffscreen (pPixmap))
-    {
-	*xp = x;
-	*yp = y;
 	return pPixmap;
-    }
-    return NULL;
+    else
+	return NULL;
 }
 
 Bool

Index: kaapict.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaapict.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kaapict.c	17 May 2004 07:14:23 -0000	1.9
+++ kaapict.c	10 Jun 2004 19:22:58 -0000	1.10
@@ -277,8 +277,7 @@
     kaaGetPixelFromRGBA(&pixel, red, green, blue, alpha,
 			pDst->format);
 
-    if (!(*pKaaScr->info->PrepareSolid) (pDstPix, GXcopy, 0xffffff,
-					 pixel))
+    if (!(*pKaaScr->info->PrepareSolid) (pDstPix, GXcopy, 0xffffffff, pixel))
     {
 	REGION_UNINIT(pDst->pDrawable->pScreen, &region);
 	return -1;
@@ -451,12 +450,20 @@
     }
 
     if (!pSrcPix && (!pMask || pMaskPix) && pKaaScr->info->UploadToScratch) {
-	if ((*pKaaScr->info->UploadToScratch) ((PixmapPtr) pSrc->pDrawable,
-					       &scratch))
+	if (pSrc->pDrawable->type == DRAWABLE_WINDOW)
+	    pSrcPix = (*pSrc->pDrawable->pScreen->GetWindowPixmap) (
+		(WindowPtr) pSrc->pDrawable);
+	else
+	    pSrcPix = (PixmapPtr) pSrc->pDrawable;
+	if ((*pKaaScr->info->UploadToScratch) (pSrcPix, &scratch))
 	    pSrcPix = &scratch;
     } else if (pSrcPix && pMask && !pMaskPix && pKaaScr->info->UploadToScratch) {
-	if ((*pKaaScr->info->UploadToScratch) ((PixmapPtr) pMask->pDrawable,
-					       &scratch))
+	if (pMask->pDrawable->type == DRAWABLE_WINDOW)
+	    pMaskPix = (*pMask->pDrawable->pScreen->GetWindowPixmap) (
+		(WindowPtr) pMask->pDrawable);
+	else
+	    pMaskPix = (PixmapPtr) pMask->pDrawable;
+	if ((*pKaaScr->info->UploadToScratch) (pMaskPix, &scratch))
 	    pMaskPix = &scratch;
     }