From c78a89d761a104dfe92ab42d3d52bb69c43105c1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airliedfreedesktop.org>
Date: Wed, 28 Jan 2004 03:58:49 +0000
Subject: fix breakage associated with pointers not being initialised in
 mesa_create_context

---
 src/mesa/drivers/dri/i810/i810context.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/mesa/drivers/dri/i810/i810context.c')

diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c
index f443ce0201..8de1572a9b 100644
--- a/src/mesa/drivers/dri/i810/i810context.c
+++ b/src/mesa/drivers/dri/i810/i810context.c
@@ -162,12 +162,20 @@ i810CreateContext( const __GLcontextModes *mesaVis,
       return GL_FALSE;
    }
 
+   driContextPriv->driverPrivate = imesa;
+
+   imesa->i810Screen = i810Screen;
+   imesa->driScreen = sPriv;
+   imesa->sarea = saPriv;
+   imesa->glBuffer = NULL;
+
    /* Init default driver functions then plug in our I810-specific functions
     * (the texture functions are especially important)
     */
    _mesa_init_driver_functions( &functions );
-   i810InitTextureFuncs( &functions );
    i810InitIoctlFuncs( &functions );
+   i810InitTextureFuncs( &functions );
+
 
    /* Allocate the Mesa context */
    if (sharedContextPrivate)
@@ -180,12 +188,6 @@ i810CreateContext( const __GLcontextModes *mesaVis,
       FREE(imesa);
       return GL_FALSE;
    }
-   driContextPriv->driverPrivate = imesa;
-
-   imesa->i810Screen = i810Screen;
-   imesa->driScreen = sPriv;
-   imesa->sarea = saPriv;
-   imesa->glBuffer = NULL;
 
    (void) memset( imesa->texture_heaps, 0, sizeof( imesa->texture_heaps ) );
    make_empty_list( & imesa->swapped );
-- 
cgit v1.2.3