diff options
| author | Eric Anholt <eric@anholt.net> | 2011-06-10 12:58:56 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-06-14 11:17:39 -0700 |
| commit | 10e418f3815d690b2526e835bc7eb421b6be7050 (patch) | |
| tree | 982da3af4c97148dfdff2ad2e2442ae4d1b9b2a1 /src/mesa/drivers/dri/nouveau/nouveau_texture.c | |
| parent | b0c4db68b2bea1d41ba42211a3ff6b41dfee21a8 (diff) | |
mesa: Switch generate_mipmaps_compressed() to using TexImage2D to upload.
The code was playing fast and loose with rowstrides, which meant that
if a driver chose anything different for its alignment requirements,
the generated mipmaps came out garbage. Unlike the uncompressed case,
we can't generate mipmaps directly into image->Data, so by using
TexImage2D we cut out most of the weird logic that existed to generate
in-place into ->Data. The up/downside is that the driver recovery
code for the fact that _mesa_generate_mipmaps whacked ->Data has to be
turned off for compressed now.
Fixes 6 piglit tests about compressed mipmap gen.
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_texture.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 36e68c99181..dcfd316c49f 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -688,8 +688,10 @@ nouveau_generate_mipmap(struct gl_context *ctx, GLenum target, _mesa_generate_mipmap(ctx, target, t); nouveau_teximage_unmap(ctx, base); - store_mipmap(ctx, target, t->BaseLevel + 1, - get_last_level(t), t); + 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); |