fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "mesa/intel: map/unmap texture objects around mipmap generation function."

Browse source 
This reverts commit c50ffc4cb8.

I'll fix this using the mipmap hooks I just picked from gallium-0.1
This commit is contained in:
Dave Airlie 2008-05-09 13:33:56 +10:00
parent d4e1d85dba
commit 0449bab2f8
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/drivers/dri/intel/intel_tex.c
View file

@ -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;

6
src/mesa/main/fbobject.c
View file

@ -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);
}