diff options
| -rw-r--r-- | src/i830_exa.c | 8 | ||||
| -rw-r--r-- | uxa/uxa-priv.h | 4 | ||||
| -rw-r--r-- | uxa/uxa.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/i830_exa.c b/src/i830_exa.c index fdce65f6..fd29df11 100644 --- a/src/i830_exa.c +++ b/src/i830_exa.c @@ -726,12 +726,12 @@ I830EXAInit(ScreenPtr pScreen) return TRUE; } -static DevPrivateKey uxa_pixmap_key = &uxa_pixmap_key; +static int uxa_pixmap_index; static void i830_uxa_set_pixmap_bo (PixmapPtr pixmap, dri_bo *bo) { - dixSetPrivate(&pixmap->devPrivates, uxa_pixmap_key, bo); + dixSetPrivate(&pixmap->devPrivates, &uxa_pixmap_index, bo); } dri_bo * @@ -742,7 +742,7 @@ i830_get_pixmap_bo(PixmapPtr pixmap) I830Ptr i830 = I830PTR(scrn); if (i830->accel == ACCEL_UXA) { - return dixLookupPrivate(&pixmap->devPrivates, uxa_pixmap_key); + return dixLookupPrivate(&pixmap->devPrivates, &uxa_pixmap_index); } else if (i830->accel == ACCEL_EXA) { struct i830_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(pixmap); @@ -874,7 +874,7 @@ i830_uxa_init (ScreenPtr pScreen) ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; I830Ptr i830 = I830PTR(scrn); - if (!dixRequestPrivate(uxa_pixmap_key, 0)) + if (!dixRequestPrivate(&uxa_pixmap_index, 0)) return FALSE; i830->uxa_driver = uxa_driver_alloc(); diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h index c50ab3af..13535876 100644 --- a/uxa/uxa-priv.h +++ b/uxa/uxa-priv.h @@ -155,8 +155,8 @@ typedef struct { (PixmapWidthPaddingInfo[d].padRoundUp+1))) #endif -extern DevPrivateKey uxa_screen_key; -#define uxa_get_screen(s) ((uxa_screen_t *)dixLookupPrivate(&(s)->devPrivates, uxa_screen_key)) +extern int uxa_screen_index; +#define uxa_get_screen(s) ((uxa_screen_t *)dixLookupPrivate(&(s)->devPrivates, &uxa_screen_index)) /** Align an offset to an arbitrary alignment */ #define UXA_ALIGN(offset, align) (((offset) + (align) - 1) - \ @@ -39,7 +39,7 @@ #include "dixfontstr.h" #include "uxa.h" -DevPrivateKey uxa_screen_key = &uxa_screen_key; +int uxa_screen_index; /** * uxa_get_drawable_pixmap() returns a backing pixmap for a given drawable. @@ -422,7 +422,7 @@ uxa_driver_init(ScreenPtr screen, uxa_driver_t *uxa_driver) uxa_screen->info = uxa_driver; - dixSetPrivate(&screen->devPrivates, uxa_screen_key, uxa_screen); + dixSetPrivate(&screen->devPrivates, &uxa_screen_index, uxa_screen); // exaDDXDriverInit(screen); |