diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-07-21 12:36:51 +0200 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2012-07-26 07:38:56 +0300 |
| commit | a83fcb6f84995dc50b8adffc27e264a663fbd606 (patch) | |
| tree | 9e12ca73eb670f18f703a08b5061b951b0789f7a /src/lx_exa.c | |
| parent | 68646c3119a69a8391a49f2d565672d73829e2c9 (diff) | |
Initial stab at converting geode to new X1.13 API
Preparing to compile geode on X 1.13
All compiler errors are gone as far as I can tell,
but I lack the hardware to verify it works as well.
Diffstat (limited to 'src/lx_exa.c')
| -rw-r--r-- | src/lx_exa.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lx_exa.c b/src/lx_exa.c index 1f01717..bcff23e 100644 --- a/src/lx_exa.c +++ b/src/lx_exa.c @@ -461,7 +461,9 @@ struct blend_ops_t { } }; +#ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof((a)) / (sizeof(*(a)))) +#endif static const struct exa_format_t * lx_get_format(PicturePtr p) @@ -1508,7 +1510,7 @@ lx_upload_to_screen(PixmapPtr pxDst, int x, int y, int w, int h, static Bool lx_exa_pixmap_is_offscreen(PixmapPtr pPixmap) { - ScrnInfoPtr pScrni = xf86Screens[pPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScrni = xf86ScreenToScrn(pPixmap->drawable.pScreen); GeodeRec *pGeode = GEODEPTR(pScrni); void *start = (void *) (pGeode->FBBase); void *end = @@ -1527,7 +1529,7 @@ lx_exa_pixmap_is_offscreen(PixmapPtr pPixmap) Bool LXExaInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrni = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrni = xf86ScreenToScrn(pScreen); GeodeRec *pGeode = GEODEPTR(pScrni); ExaDriverPtr pExa = pGeode->pExa; |