Commit 736baf22 authored by Brian's avatar Brian

remove driScrnPriv field from intel_screen

parent cd360b7d
......@@ -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;
......
......@@ -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) +
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment