summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorDave Airlie <airliedfreedesktop.org>2004-01-28 03:58:49 +0000
committerDave Airlie <airliedfreedesktop.org>2004-01-28 03:58:49 +0000
commitc78a89d761a104dfe92ab42d3d52bb69c43105c1 (patch)
treebe59053b3d1d1e1a717c1a127012f2c83608554b /src/mesa
parent5102075330933605ca6ac58d6fe9e4d537808646 (diff)
fix breakage associated with pointers not being initialised in
mesa_create_context
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i810/i810context.c16
1 files changed, 9 insertions, 7 deletions
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 );