diff options
author | Felix Kuehling <[email protected]> | 2004-01-26 23:38:12 +0000 |
---|---|---|
committer | Felix Kuehling <[email protected]> | 2004-01-26 23:38:12 +0000 |
commit | 8135a445f3b0ae207ec5e4485b5936050d438320 (patch) | |
tree | e0c63e4985bd670b34686ca5733d99364c9a1a12 /src/mesa/drivers/dri/i810/i810tex.c | |
parent | ef167c63282bb9b98492f46f9a3ad8f861db1a30 (diff) |
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.
Diffstat (limited to 'src/mesa/drivers/dri/i810/i810tex.c')
-rw-r--r-- | src/mesa/drivers/dri/i810/i810tex.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i810/i810tex.c b/src/mesa/drivers/dri/i810/i810tex.c index cd9ef153b7d..220d901d848 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; } |