[xserver-commit] xserver/hw/kdrive/src kaa.c,1.14.2.2,1.14.2.3

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/tmp/cvs-serv18221/hw/kdrive/src

Modified Files:
      Tag: xfixes_2_branch
	kaa.c 
Log Message:
	* hw/kdrive/src/kaa.c: (kaaDestroyPixmap), (kaaGetOffscreenPixmap):
	oops.  Failed to set window offsets in kaaGetOffscreenPixmap
	
	* hw/kdrive/vesa/vesa.c: (vesaInitScreen), (vesaFinishInitScreen):
	Initialized shadow too early; acceleration stomped damage


Index: kaa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaa.c,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -d -r1.14.2.2 -r1.14.2.3
--- kaa.c	22 Oct 2003 06:00:49 -0000	1.14.2.2
+++ kaa.c	22 Oct 2003 06:52:44 -0000	1.14.2.3
@@ -232,9 +232,6 @@
 static Bool
 kaaDestroyPixmap (PixmapPtr pPixmap)
 {
-    ScreenPtr pScreen = pPixmap->drawable.pScreen;
-    Bool ret;
-    
     if (pPixmap->refcnt == 1)
     {
 	KaaPixmapPriv (pPixmap);
@@ -251,10 +248,7 @@
 	    pPixmap->devKind = pKaaPixmap->devKind;
 	}
     }
-
-    ret = fbDestroyPixmap (pPixmap);
-    
-    return ret;
+    return fbDestroyPixmap (pPixmap);
 }
 
 static PixmapPtr 
@@ -304,17 +298,19 @@
 kaaGetOffscreenPixmap (DrawablePtr pDrawable, int *xp, int *yp)
 {
     PixmapPtr	pPixmap;
-    int		x = 0, y = 0;
+    int		x, y;
     
     if (pDrawable->type == DRAWABLE_WINDOW) {
 	pPixmap = (*pDrawable->pScreen->GetWindowPixmap) ((WindowPtr) pDrawable);
-	if (x)
-	    x += pDrawable->x;
-	if (y)
-	    y += pDrawable->y;
+	x = pDrawable->x;
+	y = pDrawable->y;
     }
     else
+    {
 	pPixmap = (PixmapPtr) pDrawable;
+	x = 0;
+	y = 0;
+    }
     if (kaaPixmapIsOffscreen (pPixmap))
     {
 	x += pPixmap->drawable.x;