We need nmesa->driFd and friends setup before we call nouveauFifoInit

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index ff00782c991da2f7587679c68b39728d70e67867..37582f3583b6d0bbff6b2e6aeb025f8560d60744 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -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");