summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2003-10-25 15:13:20 +0000
committerKeith Packard <keithp@keithp.com>2003-10-25 15:13:20 +0000
commitf1d14244dfb6c0ad91e0881efa0bfea408dbaadb (patch)
treeecd16144af9b17479052ea70d4c768b2adb1dac4
parent0e1c63037681fb46a2892b661759507f8026d5ea (diff)
Was using byteStride before set in computing off_screen_base Also a couple
of unused variables removed
-rw-r--r--hw/kdrive/vesa/vesa.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c
index 7582fecb7..9576bca04 100644
--- a/hw/kdrive/vesa/vesa.c
+++ b/hw/kdrive/vesa/vesa.c
@@ -815,7 +815,6 @@ Bool
vesaSetShadow (ScreenPtr pScreen)
{
KdScreenPriv(pScreen);
- KdScreenInfo *screen = pScreenPriv->screen;
VesaScreenPrivPtr pscr = pScreenPriv->screen->driver;
ShadowUpdateProc update;
ShadowWindowProc window = 0;
@@ -1006,10 +1005,10 @@ vesaMapFramebuffer (KdScreenInfo *screen)
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 @@ vesaRandRSetConfig (ScreenPtr pScreen,
int oldmmwidth;
int oldmmheight;
int newwidth, newheight;
- PixmapPtr pPixmap;
if (screen->randr & (RR_Rotate_0|RR_Rotate_180))
{
@@ -1273,8 +1271,6 @@ vesaRandRInit (ScreenPtr pScreen)
Bool
vesaInitScreen(ScreenPtr pScreen)
{
- KdScreenPriv(pScreen);
-
return TRUE;
}