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/radeon/radeon_context.c | 5 ----- src/mesa/drivers/dri/radeon/radeon_tex.c | 9 ++++----- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'src/mesa/drivers/dri/radeon') diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 6e9cc5f5d9..de197aa4db 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -354,11 +354,6 @@ radeonCreateContext( const __GLcontextModes *glVisual, rmesa->boxes = 0; - /* formerly in radeon_tex.c */ - driInitTextureObjects( ctx, & rmesa->swapped, - DRI_TEXMGR_DO_TEXTURE_1D - | DRI_TEXMGR_DO_TEXTURE_2D ); - /* Initialize the software rasterizer and helper modules. */ _swrast_CreateContext( ctx ); diff --git a/src/mesa/drivers/dri/radeon/radeon_tex.c b/src/mesa/drivers/dri/radeon/radeon_tex.c index 99aa4a458b..78220c6860 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tex.c +++ b/src/mesa/drivers/dri/radeon/radeon_tex.c @@ -674,11 +674,9 @@ static void radeonBindTexture( GLcontext *ctx, GLenum target, ctx->Texture.CurrentUnit ); } - if ( target == GL_TEXTURE_2D || target == GL_TEXTURE_1D ) { - if ( texObj->DriverData == NULL ) { - radeonAllocTexObj( texObj ); - } - } + assert( (target != GL_TEXTURE_1D && target != GL_TEXTURE_2D && + target != GL_TEXTURE_RECTANGLE_NV) || + (texObj->DriverData != NULL) ); } @@ -741,6 +739,7 @@ radeonNewTextureObject( GLcontext *ctx, GLuint name, GLenum target ) if (!obj) return NULL; obj->MaxAnisotropy = rmesa->initialMaxAnisotropy; + radeonAllocTexObj( obj ); return obj; } -- cgit v1.2.3