We need nmesa->driFd and friends setup before we call nouveauFifoInit
This commit is contained in:
@@ -78,6 +78,16 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual,
|
||||
if ( !nmesa )
|
||||
return GL_FALSE;
|
||||
|
||||
nmesa->driContext = driContextPriv;
|
||||
nmesa->driScreen = sPriv;
|
||||
nmesa->driDrawable = NULL;
|
||||
nmesa->hHWContext = driContextPriv->hHWContext;
|
||||
nmesa->driHwLock = &sPriv->pSAREA->lock;
|
||||
nmesa->driFd = sPriv->fd;
|
||||
|
||||
nmesa->screen = (nouveauScreenPtr)(sPriv->private);
|
||||
screen=nmesa->screen;
|
||||
|
||||
/* Create the hardware context */
|
||||
if (!nouveauFifoInit(nmesa))
|
||||
return GL_FALSE;
|
||||
@@ -104,16 +114,6 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual,
|
||||
driContextPriv->driverPrivate = nmesa;
|
||||
ctx = nmesa->glCtx;
|
||||
|
||||
nmesa->driContext = driContextPriv;
|
||||
nmesa->driScreen = sPriv;
|
||||
nmesa->driDrawable = NULL;
|
||||
nmesa->hHWContext = driContextPriv->hHWContext;
|
||||
nmesa->driHwLock = &sPriv->pSAREA->lock;
|
||||
nmesa->driFd = sPriv->fd;
|
||||
|
||||
nmesa->screen = (nouveauScreenPtr)(sPriv->private);
|
||||
screen=nmesa->screen;
|
||||
|
||||
/* Parse configuration files */
|
||||
driParseConfigFiles (&nmesa->optionCache, &screen->optionCache,
|
||||
screen->driScreen->myNum, "nouveau");
|
||||
|
||||
Reference in New Issue
Block a user