[xserver-commit] xserver/hw/kdrive/vesa vesa.c,1.26.2.3,1.26.2.4

[Keith Packard]

Committed by: keithp

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

Modified Files:
      Tag: xfixes_2_branch
	vesa.c 
Log Message:
	* hw/kdrive/vesa/vesa.c: (vesaSetShadow), (vesaMapFramebuffer),
	(vesaRandRSetConfig), (vesaInitScreen):
	Was using byteStride before set in computing off_screen_base
	Also a couple of unused variables removed


Index: vesa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/vesa/vesa.c,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -d -r1.26.2.3 -r1.26.2.4
--- vesa.c	24 Oct 2003 09:34:33 -0000	1.26.2.3
+++ vesa.c	25 Oct 2003 15:13:20 -0000	1.26.2.4
@@ -815,7 +815,6 @@
 vesaSetShadow (ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo	*screen = pScreenPriv->screen;
     VesaScreenPrivPtr	pscr = pScreenPriv->screen->driver;
     ShadowUpdateProc	update;
     ShadowWindowProc	window = 0;
@@ -1006,10 +1005,10 @@
     else
     {
 	screen->fb[0].frameBuffer = (CARD8 *) (pscr->fb);
-	screen->off_screen_base = screen->fb[0].byteStride * screen->height;
 	screen->fb[0].byteStride = pscr->mode.BytesPerScanLine;
 	screen->fb[0].pixelStride = ((pscr->mode.BytesPerScanLine * 8) / 
 				     screen->fb[0].bitsPerPixel);
+	screen->off_screen_base = screen->fb[0].byteStride * screen->height;
     }
     
     return TRUE;
@@ -1127,7 +1126,6 @@
     int			oldmmwidth;
     int			oldmmheight;
     int			newwidth, newheight;
-    PixmapPtr		pPixmap;
 
     if (screen->randr & (RR_Rotate_0|RR_Rotate_180))
     {
@@ -1273,8 +1271,6 @@
 Bool
 vesaInitScreen(ScreenPtr pScreen)
 {
-    KdScreenPriv(pScreen);
-
     return TRUE;
 }