diff options
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex.c | 18 | ||||
-rw-r--r-- | src/mesa/main/fbobject.c | 6 |
2 files changed, 0 insertions, 24 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c index 1fa9da61bd8..329af0d1b04 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 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); } |