From: Ben Skeggs <darktama@iinet.net.au>
Date: Sun, 12 Nov 2006 02:06:30 +0000 (+0000)
Subject: We need nmesa->driFd and friends setup before we call nouveauFifoInit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b8e05366e192ab4ebaf69dc8a4a18da4e65cbf80;p=mesa.git

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 ff00782c991..37582f3583b 100644
--- 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");