diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-30 11:40:56 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-30 11:40:56 -0700 |
| commit | 68516ee7434c895dfa6edf4a54e54a5880cb8fcb (patch) | |
| tree | 9ad4183615053b8f70ee3e742733f028049481bd | |
| parent | 9d552e5d9edfdda14cb1f4cfcf4197307d4e4a54 (diff) | |
Adjust to DevPrivate API changes
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/leo.h | 4 | ||||
| -rw-r--r-- | src/leo_accel.c | 9 |
2 files changed, 12 insertions, 1 deletions
@@ -85,7 +85,11 @@ typedef struct { #define GET_LEO_FROM_SCRN(p) ((LeoPtr)((p)->driverPrivate)) +#if HAS_DEVPRIVATEKEYREC +extern DevPrivateKeyRec LeoGCPrivateIndex; +#else extern int LeoGCPrivateIndex; +#endif #define LEO_OLDPRIV (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4) #if LEO_OLDPRIV diff --git a/src/leo_accel.c b/src/leo_accel.c index 368e76e..209cbeb 100644 --- a/src/leo_accel.c +++ b/src/leo_accel.c @@ -41,7 +41,11 @@ #include "leo.h" +#if HAS_DEVPRIVATEKEYREC +DevPrivateKeyRec LeoGCPrivateIndex; +#else int LeoGCPrivateIndex; +#endif int leoRopTable[16] = { LEO_ATTR_RGBE_ENABLE|LEO_ROP_ZERO, /* GXclear */ @@ -104,11 +108,14 @@ Bool LeoAccelInit (ScreenPtr pScreen, LeoPtr pLeo) } if (!AllocateGCPrivate(pScreen, LeoGCPrivateIndex, sizeof(LeoPrivGCRec))) return FALSE; +#elif HAS_DIXREGISTERPRIVATEKEY + if (!dixRegisterPrivateKey(&LeoGCPrivateIndex, PRIVATE_GC, sizeof(LeoPrivGCRec))) + return FALSE; #else if (!dixRequestPrivate(&LeoGCPrivateIndex, sizeof(LeoPrivGCRec))) return FALSE; #endif - + pLeo->lc0 = lc0 = (LeoCommand0 *) ((char *)pLeo->fb + LEO_LC0_VOFF); pLeo->ld0 = ld0 = (LeoDraw *) ((char *)pLeo->fb + LEO_LD0_VOFF); |