From 0449bab2f8722f277213e44da13de6a0b5ae7b5b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 9 May 2008 13:33:56 +1000 Subject: Revert "mesa/intel: map/unmap texture objects around mipmap generation function." This reverts commit c50ffc4cb89b67ae59208eb72cdb664c846ba987. I'll fix this using the mipmap hooks I just picked from gallium-0.1 --- src/mesa/drivers/dri/intel/intel_tex.c | 18 ------------------ src/mesa/main/fbobject.c | 6 ------ 2 files changed, 24 deletions(-) (limited to 'src') diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c index 1fa9da61bd..329af0d1b0 100644 --- a/src/mesa/drivers/dri/intel/intel_tex.c +++ b/src/mesa/drivers/dri/intel/intel_tex.c @@ -198,21 +198,6 @@ intel_generate_mipmap(GLcontext *ctx, GLenum target, } } -void intelMapTexture(GLcontext *ctx, struct gl_texture_object *texObj) -{ - struct intel_texture_object *intelObj = intel_texture_object(texObj); - struct intel_context *intel = intel_context(ctx); - - intel_tex_map_images(intel, intelObj); -} - -void intelUnmapTexture(GLcontext *ctx, struct gl_texture_object *texObj) -{ - struct intel_texture_object *intelObj = intel_texture_object(texObj); - struct intel_context *intel = intel_context(ctx); - - intel_tex_unmap_images(intel, intelObj); -} void intelInitTextureFuncs(struct dd_function_table *functions) @@ -248,9 +233,6 @@ intelInitTextureFuncs(struct dd_function_table *functions) functions->UpdateTexturePalette = 0; functions->IsTextureResident = intelIsTextureResident; - functions->MapTexture = intelMapTexture; - functions->UnmapTexture = intelUnmapTexture; - #if DO_DEBUG && !defined(__ia64__) if (INTEL_DEBUG & DEBUG_BUFMGR) functions->TextureMemCpy = timed_memcpy; diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 1b11828966..8e9948cb45 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -1542,16 +1542,10 @@ _mesa_GenerateMipmapEXT(GLenum target) texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; texObj = _mesa_select_tex_object(ctx, texUnit, target); - if (ctx->Driver.MapTexture) - ctx->Driver.MapTexture(ctx, texObj); - /* XXX this might not handle cube maps correctly */ _mesa_lock_texture(ctx, texObj); ctx->Driver.GenerateMipmap(ctx, target, texObj); _mesa_unlock_texture(ctx, texObj); - - if (ctx->Driver.UnmapTexture) - ctx->Driver.UnmapTexture(ctx, texObj); } -- cgit v1.2.3