From 736baf22e98a28ed714c31650d1cee78b5b381f4 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 5 Nov 2007 11:38:46 -0700
Subject: remove driScrnPriv field from intel_screen

---
 src/mesa/drivers/dri/intel_winsys/intel_context.c | 2 +-
 src/mesa/drivers/dri/intel_winsys/intel_screen.c  | 5 ++---
 src/mesa/drivers/dri/intel_winsys/intel_screen.h  | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 9e6f95abb0..91ac077a48 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -102,7 +102,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
     * memory pools
     */
    DRM_LIGHT_LOCK(sPriv->fd, &sPriv->pSAREA->lock, driContextPriv->hHWContext);
-   havePools = intelCreatePools(intelScreen);
+   havePools = intelCreatePools(sPriv);
    DRM_UNLOCK(sPriv->fd, &sPriv->pSAREA->lock, driContextPriv->hHWContext);
    if (!havePools)
       return GL_FALSE;
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
index 332dc46461..646c4ec911 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.c
@@ -157,10 +157,10 @@ intelUpdateScreenRotation(__DRIscreenPrivate * sPriv, drmI830Sarea * sarea)
 
 
 GLboolean
-intelCreatePools(intelScreenPrivate *intelScreen)
+intelCreatePools(__DRIscreenPrivate * sPriv)
 {
    unsigned batchPoolSize = 1024*1024;
-   __DRIscreenPrivate * sPriv = intelScreen->driScrnPriv;
+   intelScreenPrivate *intelScreen = sPriv->private;
 
    if (intelScreen->havePools)
       return GL_TRUE;
@@ -221,7 +221,6 @@ intelInitDriver(__DRIscreenPrivate * sPriv)
    driParseOptionInfo(&intelScreen->optionCache,
                       __driConfigOptions, __driNConfigOptions);
 
-   intelScreen->driScrnPriv = sPriv;
    sPriv->private = (void *) intelScreen;
 
    intelScreen->sarea = (drmI830Sarea *) (((GLubyte *) sPriv->pSAREA) +
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.h b/src/mesa/drivers/dri/intel_winsys/intel_screen.h
index c0e7ff8c5d..aab745ea4d 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_screen.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.h
@@ -55,7 +55,6 @@ struct intel_screen
    int deviceID;
    int drmMinor;
 
-   __DRIscreenPrivate *driScrnPriv;
    drmI830Sarea *sarea;
 
    /**
@@ -92,7 +91,7 @@ extern struct _DriBufferPool *driBatchPoolInit(int fd, unsigned flags,
                                                unsigned checkDelayed);
 
 extern GLboolean
-intelCreatePools(intelScreenPrivate *intelScreen);
+intelCreatePools(__DRIscreenPrivate *sPriv);
 
 extern GLboolean
 intelCreateContext(const __GLcontextModes * mesaVis,
-- 
cgit v1.2.3