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/i810/i810context.c | 2 -- src/mesa/drivers/dri/i810/i810tex.c | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/i810') diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c index 78698e861c..f443ce0201 100644 --- a/src/mesa/drivers/dri/i810/i810context.c +++ b/src/mesa/drivers/dri/i810/i810context.c @@ -292,8 +292,6 @@ i810CreateContext( const __GLcontextModes *mesaVis, i810InitVB( ctx ); i810InitState( ctx ); - driInitTextureObjects( ctx, &imesa->swapped, DRI_TEXMGR_DO_TEXTURE_2D); - #if DO_DEBUG I810_DEBUG = driParseDebugString( getenv( "I810_DEBUG" ), debug_control ); diff --git a/src/mesa/drivers/dri/i810/i810tex.c b/src/mesa/drivers/dri/i810/i810tex.c index cd9ef153b7..220d901d84 100644 --- a/src/mesa/drivers/dri/i810/i810tex.c +++ b/src/mesa/drivers/dri/i810/i810tex.c @@ -412,9 +412,7 @@ static void i810TexSubImage2D( GLcontext *ctx, static void i810BindTexture( GLcontext *ctx, GLenum target, struct gl_texture_object *tObj ) { - if (!tObj->DriverData) { - i810AllocTexObj( ctx, tObj ); - } + assert( (target != GL_TEXTURE_2D) || (tObj->DriverData != NULL) ); } @@ -532,6 +530,7 @@ i810NewTextureObject( GLcontext *ctx, GLuint name, GLenum target ) { struct gl_texture_object *obj; obj = _mesa_new_texture_object(ctx, name, target); + i810AllocTexObj( ctx, obj ); return obj; } -- cgit v1.2.3