remove driScrnPriv field from intel_screen

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 9e6f95abb0e21b31183b6f2e9b83d463b1423ff0..91ac077a4823a9eed58805e9b538c949e901ed00 100644 (file)
--- 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 332dc46461821ac528e1d10f40d1dde8a8576a3b..646c4ec911ab8cb36052868b709eccb563afbb4c 100644 (file)
--- 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 c0e7ff8c5dbf74721739bc3e82bd266b67fcb71a..aab745ea4d8ea149d6c5d379495ccb7eae275913 100644 (file)
--- 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,