summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/nouveau
diff options
context:
space:
mode:
authorGeorge Sapountzis <[email protected]>2011-11-03 13:04:57 +0200
committerGeorge Sapountzis <[email protected]>2011-11-04 23:33:04 +0200
commit875a757ddd103722cfe9a2b21035024aa5a23d32 (patch)
tree98d0473304b03638e5827746494d178e3b9ee677 /src/mesa/drivers/dri/nouveau
parent7192c37294964b3f6e1551469f161593ec8f851d (diff)
dri: unify __DRIscreenRec
Also drop DriverAPI field, this is a static symbol and I don't see why it should be accessed through __DRIscreenRec
Diffstat (limited to 'src/mesa/drivers/dri/nouveau')
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_context.c2
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_screen.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 2b9507c6a81..0e3321e96f4 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -58,7 +58,7 @@ nouveau_context_create(gl_api api,
void *share_ctx)
{
__DRIscreen *dri_screen = dri_ctx->driScreenPriv;
- struct nouveau_screen *screen = dri_screen->private;
+ struct nouveau_screen *screen = dri_screen->driverPrivate;
struct nouveau_context *nctx;
struct gl_context *ctx;
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 2ce07647317..c845280f360 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -97,7 +97,7 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
if (!screen)
return NULL;
- dri_screen->private = screen;
+ dri_screen->driverPrivate = screen;
dri_screen->extensions = nouveau_screen_extensions;
screen->dri_screen = dri_screen;
@@ -138,7 +138,7 @@ fail:
static void
nouveau_destroy_screen(__DRIscreen *dri_screen)
{
- struct nouveau_screen *screen = dri_screen->private;
+ struct nouveau_screen *screen = dri_screen->driverPrivate;
if (!screen)
return;
@@ -147,7 +147,7 @@ nouveau_destroy_screen(__DRIscreen *dri_screen)
nouveau_device_close(&screen->device);
FREE(screen);
- dri_screen->private = NULL;
+ dri_screen->driverPrivate = NULL;
}
static GLboolean