From 8135a445f3b0ae207ec5e4485b5936050d438320 Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Mon, 26 Jan 2004 23:38:12 +0000 Subject: Make the drivers using the common texmem code work with NewTextureObject in Mesa. This is analogous to changes idr made to the r200 driver. Patch submitted by Andreas Stenglein. --- src/mesa/drivers/dri/mga/mga_xmesa.c | 4 ---- src/mesa/drivers/dri/mga/mgatex.c | 9 +++------ 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'src/mesa/drivers/dri/mga') diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index a3eb758d12..169615d0c0 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -527,10 +527,6 @@ mgaCreateContext( const __GLcontextModes *mesaVis, mgaDDInitPixelFuncs( ctx ); mgaDDInitTriFuncs( ctx ); - driInitTextureObjects( ctx, & mmesa->swapped, - (DRI_TEXMGR_DO_TEXTURE_2D | - DRI_TEXMGR_DO_TEXTURE_RECT) ); - mgaInitVB( ctx ); mgaInitState( mmesa ); diff --git a/src/mesa/drivers/dri/mga/mgatex.c b/src/mesa/drivers/dri/mga/mgatex.c index 2fef5b832a..1b45c0f901 100644 --- a/src/mesa/drivers/dri/mga/mgatex.c +++ b/src/mesa/drivers/dri/mga/mgatex.c @@ -484,12 +484,8 @@ static void mgaBindTexture( GLcontext *ctx, GLenum target, struct gl_texture_object *tObj ) { - if ( target == GL_TEXTURE_2D || - target == GL_TEXTURE_RECTANGLE_NV ) { - if ( tObj->DriverData == NULL ) { - mgaAllocTexObj( tObj ); - } - } + assert( (target != GL_TEXTURE_2D && target != GL_TEXTURE_RECTANGLE_NV) || + (tObj->DriverData != NULL) ); } @@ -523,6 +519,7 @@ mgaNewTextureObject( GLcontext *ctx, GLuint name, GLenum target ) { struct gl_texture_object *obj; obj = _mesa_new_texture_object(ctx, name, target); + mgaAllocTexObj( obj ); return obj; } -- cgit v1.2.3