diff options
| author | Brian Paul <[email protected]> | 2011-08-01 23:04:12 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2011-10-03 13:29:30 -0700 |
| commit | e0304180c32227342dbb67b707bfae446543bb48 (patch) | |
| tree | 05224697ca0948eded9adb328a215bc2c5a3a24f /src/mesa/drivers/dri/nouveau | |
| parent | 1165b64f561a7bdd3f603d9e30a2340774ba31ee (diff) | |
mesa: Convert _mesa_generate_mipmap to MapTexImage()-based access.
Now that we can zero-copy generate the mipmaps into brand new
glTexImage()-generated storage using MapTextureImage(), we no longer
need to allocate image->Data in mipmap generate. This requires
deleting the drivers' old overrides of the miptree tracking after
calling _mesa_generate_mipmap at the same time, or the drivers
promptly lose our newly-generated data.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 9dc21869ca8..508c8a59dbd 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -739,17 +739,7 @@ nouveau_generate_mipmap(struct gl_context *ctx, GLenum target, { if (_mesa_meta_check_generate_mipmap_fallback(ctx, target, t)) { struct gl_texture_image *base = t->Image[0][t->BaseLevel]; - - nouveau_teximage_map(ctx, base, GL_MAP_READ_BIT, - 0, 0, base->Width, base->Height); _mesa_generate_mipmap(ctx, target, t); - nouveau_teximage_unmap(ctx, base); - - if (!_mesa_is_format_compressed(base->TexFormat)) { - store_mipmap(ctx, target, t->BaseLevel + 1, - get_last_level(t), t); - } - } else { _mesa_meta_GenerateMipmap(ctx, target, t); } |