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/main/fbobject.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/mesa/main') 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