[xserver-commit] xserver/hw/kdrive/vesa vesa.c,1.26.2.1,1.26.2.2

[Keith Packard]

Committed by: keithp

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

Modified Files:
      Tag: xfixes_2_branch
	vesa.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: vesa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/vesa/vesa.c,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -u -d -r1.26.2.1 -r1.26.2.2
--- vesa.c	22 Oct 2003 06:00:50 -0000	1.26.2.1
+++ vesa.c	22 Oct 2003 06:52:44 -0000	1.26.2.2
@@ -1334,7 +1334,7 @@
 Bool
 vesaInitScreen(ScreenPtr pScreen)
 {
-    return shadowSetup (pScreen);
+    return TRUE;
 }
 
 Bool
@@ -1344,6 +1344,9 @@
     
     vesaConfigureScreen (pScreen);
 
+    if (!shadowSetup (pScreen))
+	return FALSE;
+    
     pPixmap = vesaGetPixmap (pScreen);
     if (!pPixmap)
 	return FALSE;