frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't call dixSetPrivate directly. 

We may change the way to set/get those private data latter.
consolidate to glamor_set_pixmap/screen_private is better
than call those dixSetPrivate directly.

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
This commit is contained in:
Zhigang Gong 2012-02-02 09:34:42 +08:00 committed by Eric Anholt
parent bf7d79dc0a
commit 1ab4002874
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glamor/glamor.c
View File

@ -70,8 +70,7 @@ glamor_set_pixmap_type(PixmapPtr pixmap, glamor_pixmap_type_t type)
pixmap_priv = glamor_get_pixmap_private(pixmap); pixmap_priv = glamor_get_pixmap_private(pixmap);
if (pixmap_priv == NULL) { if (pixmap_priv == NULL) {
pixmap_priv = calloc(sizeof(*pixmap_priv), 1); pixmap_priv = calloc(sizeof(*pixmap_priv), 1);
dixSetPrivate(&pixmap->devPrivates, glamor_set_pixmap_private(pixmap, pixmap_priv);
glamor_pixmap_private_key, pixmap_priv);
pixmap_priv->container = pixmap; pixmap_priv->container = pixmap;
pixmap_priv->glamor_priv = glamor_priv; pixmap_priv->glamor_priv = glamor_priv;
} }
@ -151,9 +150,7 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
return fbCreatePixmap(screen, w, h, depth, usage); return fbCreatePixmap(screen, w, h, depth, usage);
} }
dixSetPrivate(&pixmap->devPrivates, glamor_set_pixmap_private(pixmap, pixmap_priv);
glamor_pixmap_private_key,
pixmap_priv);
pixmap_priv->container = pixmap; pixmap_priv->container = pixmap;
pixmap_priv->glamor_priv = glamor_priv; pixmap_priv->glamor_priv = glamor_priv;
@ -269,8 +266,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
goto fail; goto fail;
} }
dixSetPrivate(&screen->devPrivates, glamor_screen_private_key, glamor_set_screen_private(screen, glamor_priv);
glamor_priv);
if (!dixRegisterPrivateKey if (!dixRegisterPrivateKey
(glamor_pixmap_private_key, PRIVATE_PIXMAP, 0)) { (glamor_pixmap_private_key, PRIVATE_PIXMAP, 0)) {
@ -401,8 +397,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
fail: fail:
free(glamor_priv); free(glamor_priv);
dixSetPrivate(&screen->devPrivates, glamor_screen_private_key, glamor_set_screen_private(screen, NULL);
NULL);
return FALSE; return FALSE;
} }
@ -423,8 +418,7 @@ glamor_release_screen_priv(ScreenPtr screen)
glamor_pixmap_fini(screen); glamor_pixmap_fini(screen);
free(glamor_priv); free(glamor_priv);
dixSetPrivate(&screen->devPrivates, glamor_screen_private_key, glamor_set_screen_private(screen, NULL);
NULL);
} }
Bool Bool

20
glamor/glamor_priv.h
View File

@ -310,6 +310,16 @@ glamor_get_screen_private(ScreenPtr screen)
glamor_screen_private_key); glamor_screen_private_key);
} }
static inline void
glamor_set_screen_private(ScreenPtr screen, glamor_screen_private *priv)
{
dixSetPrivate(&screen->devPrivates,
glamor_screen_private_key,
priv);
}
static inline glamor_pixmap_private * static inline glamor_pixmap_private *
glamor_get_pixmap_private(PixmapPtr pixmap) glamor_get_pixmap_private(PixmapPtr pixmap)
{ {
@ -317,6 +327,16 @@ glamor_get_pixmap_private(PixmapPtr pixmap)
glamor_pixmap_private_key); glamor_pixmap_private_key);
} }
static inline void
glamor_set_pixmap_private(PixmapPtr pixmap, glamor_pixmap_private *priv)
{
dixSetPrivate(&pixmap->devPrivates,
glamor_pixmap_private_key,
priv);
}
/** /**
* Returns TRUE if the given planemask covers all the significant bits in the * Returns TRUE if the given planemask covers all the significant bits in the