summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2008-05-09 13:33:56 +1000
committerDave Airlie <[email protected]>2008-05-09 13:33:56 +1000
commit0449bab2f8722f277213e44da13de6a0b5ae7b5b (patch)
tree93a61bc993149768c6c72d1e96a6e5a54ad41bc3 /src/mesa/main
parentd4e1d85dba8ec4a37f68a284b5a2be15b4f2987a (diff)
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
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/fbobject.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 1b118289660..8e9948cb45d 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);
}