AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove driScrnPriv field from intel_screen

Browse Source
This commit is contained in:
Brian
2007-11-05 11:38:46 -07:00
parent cd360b7d60
commit 736baf22e9
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/intel_winsys/intel_context.c
+1 -1
View File
@@ -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;
src/mesa/drivers/dri/intel_winsys/intel_screen.c
+2 -3
View File
@@ -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) +
src/mesa/drivers/dri/intel_winsys/intel_screen.h
+1 -2
View File
@@ -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,