diff options
author | Anders Carlsson <andersca@gnome.org> | 2003-10-15 05:34:54 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@gnome.org> | 2003-10-15 05:34:54 +0000 |
commit | f4bcd36a386116c450ea6893ab3d08e81cea663b (patch) | |
tree | 87e6d214bbed363b30bd37aac76ae532be7c52b5 /hw/kdrive/src | |
parent | f5916edb172738c73c8f78b23981abfd8d03a079 (diff) |
Add a memory_base variable and use it.
Diffstat (limited to 'hw/kdrive/src')
-rw-r--r-- | hw/kdrive/src/kaa.c | 4 | ||||
-rw-r--r-- | hw/kdrive/src/kdrive.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c index e85cfe65d..139c9fcf1 100644 --- a/hw/kdrive/src/kaa.c +++ b/hw/kdrive/src/kaa.c @@ -135,11 +135,11 @@ kaaPixmapAllocArea (PixmapPtr pPixmap) ScreenPtr pScreen = pPixmap->drawable.pScreen; KaaScreenPriv (pScreen); KaaPixmapPriv (pPixmap); + KdScreenPriv (pScreen); int bpp = pPixmap->drawable.bitsPerPixel; CARD16 h = pPixmap->drawable.height; CARD16 w = pPixmap->drawable.width; int pitch = KaaPixmapPitch (w); - PixmapPtr pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen); pKaaPixmap->devKind = pPixmap->devKind; pKaaPixmap->devPrivate = pPixmap->devPrivate; @@ -157,7 +157,7 @@ kaaPixmapAllocArea (PixmapPtr pPixmap) pPixmap->drawable.width, pPixmap->drawable.height)); pPixmap->devKind = pitch * (bpp >> 3); - pPixmap->devPrivate.ptr = (pointer) ((CARD8 *) pScreenPixmap->devPrivate.ptr + pKaaPixmap->area->offset); + pPixmap->devPrivate.ptr = (pointer) ((CARD8 *) pScreenPriv->screen->memory_base + pKaaPixmap->area->offset); pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; return TRUE; } diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index 71d58e009..df59bb972 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -118,6 +118,7 @@ typedef struct _KdScreenInfo { int mynum; DDXPointRec origin; KdFrameBuffer fb[KD_MAX_FB]; + CARD8 *memory_base; int off_screen_base; int off_screen_size; pointer off_screen_areas; |