diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-01-26 23:57:19 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-01-26 23:57:19 +0000 |
commit | 727d345b41c396af419a389808fdaec11aeafc3e (patch) | |
tree | 80aef40ed487c4773ff4b6977624f16d8015a2d1 | |
parent | 8135a445f3b0ae207ec5e4485b5936050d438320 (diff) |
remove bogus assertion in DeleteTexture() function
-rw-r--r-- | src/mesa/drivers/dri/i810/i810tex.c | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i830/i830_tex.c | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/mga/mgatex.c | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r128/r128_tex.c | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_tex.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_tex.c | 1 |
6 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i810/i810tex.c b/src/mesa/drivers/dri/i810/i810tex.c index 220d901d84..dbcaae5f6f 100644 --- a/src/mesa/drivers/dri/i810/i810tex.c +++ b/src/mesa/drivers/dri/i810/i810tex.c @@ -419,7 +419,6 @@ static void i810BindTexture( GLcontext *ctx, GLenum target, static void i810DeleteTexture( GLcontext *ctx, struct gl_texture_object *tObj ) { driTextureObject * t = (driTextureObject *) tObj->DriverData; - assert(t); if (t) { i810ContextPtr imesa = I810_CONTEXT( ctx ); if (imesa) diff --git a/src/mesa/drivers/dri/i830/i830_tex.c b/src/mesa/drivers/dri/i830/i830_tex.c index 00b869a7a9..9e5e22ee68 100644 --- a/src/mesa/drivers/dri/i830/i830_tex.c +++ b/src/mesa/drivers/dri/i830/i830_tex.c @@ -428,7 +428,6 @@ static void i830BindTexture( GLcontext *ctx, GLenum target, static void i830DeleteTexture( GLcontext *ctx, struct gl_texture_object *tObj ) { driTextureObject * t = (driTextureObject *) tObj->DriverData; - assert(t); if ( t != NULL ) { i830ContextPtr imesa = I830_CONTEXT( ctx ); diff --git a/src/mesa/drivers/dri/mga/mgatex.c b/src/mesa/drivers/dri/mga/mgatex.c index 1b45c0f901..8caa1f8580 100644 --- a/src/mesa/drivers/dri/mga/mgatex.c +++ b/src/mesa/drivers/dri/mga/mgatex.c @@ -495,7 +495,6 @@ mgaDeleteTexture( GLcontext *ctx, struct gl_texture_object *tObj ) mgaContextPtr mmesa = MGA_CONTEXT( ctx ); driTextureObject * t = (driTextureObject *) tObj->DriverData; - assert(t); if ( t ) { if ( mmesa ) { FLUSH_BATCH( mmesa ); diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c index d459b6243d..0974d62201 100644 --- a/src/mesa/drivers/dri/r128/r128_tex.c +++ b/src/mesa/drivers/dri/r128/r128_tex.c @@ -572,7 +572,6 @@ static void r128DeleteTexture( GLcontext *ctx, r128ContextPtr rmesa = R128_CONTEXT(ctx); driTextureObject * t = (driTextureObject *) tObj->DriverData; - assert(t); if ( t ) { if ( t->bound && rmesa ) { FLUSH_BATCH( rmesa ); diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c index a644b2ad35..ed871e0b53 100644 --- a/src/mesa/drivers/dri/r200/r200_tex.c +++ b/src/mesa/drivers/dri/r200/r200_tex.c @@ -959,8 +959,6 @@ static void r200DeleteTexture( GLcontext *ctx, r200ContextPtr rmesa = R200_CONTEXT(ctx); driTextureObject * t = (driTextureObject *) texObj->DriverData; - assert(t); - if ( R200_DEBUG & (DEBUG_STATE|DEBUG_TEXTURE) ) { fprintf( stderr, "%s( %p (target = %s) )\n", __FUNCTION__, (void *)texObj, _mesa_lookup_enum_by_nr( texObj->Target ) ); diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c index 78220c6860..de561ab541 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tex.c +++ b/src/mesa/drivers/dri/radeon/radeon_tex.c @@ -691,7 +691,6 @@ static void radeonDeleteTexture( GLcontext *ctx, _mesa_lookup_enum_by_nr( texObj->Target ) ); } - assert(t); if ( t != NULL ) { if ( rmesa ) { RADEON_FIREVERTICES( rmesa ); |