Module: Mesa
Branch: master
Commit: e8d061fd7476ee0266a2f9860771f924e9ffccd5
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8d061fd7476ee0266a2f9860771f924e9ffccd5
Author: Dave Airlie <airl...@redhat.com>
Date: Wed Mar 2 16:13:59 2011 +1000
mesa/st: fix softpipe npot compressed mipmaps.
this fixes fbo-generatemipmap-formats rgtc and s3tc in NPOT mode
with softpipe.
r600g fails to even get level 0 correct so have to look into that
a bit further.
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
src/mesa/state_tracker/st_gen_mipmap.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c
b/src/mesa/state_tracker/st_gen_mipmap.c
index 2ec8431..a12a32e 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -265,7 +265,7 @@ fallback_generate_mipmap(struct gl_context *ctx, GLenum
target,
dstTemp = malloc(dstWidth2 * dstHeight2 * comps * (datatype ==
GL_FLOAT ? 4 : 1));
/* decompress the src image: srcData -> srcTemp */
- decompress_image(format, datatype, srcData, srcTemp, srcWidth,
srcHeight, srcTrans->stride);
+ decompress_image(format, datatype, srcData, srcTemp, srcWidth2,
srcHeight2, srcTrans->stride);
_mesa_generate_mipmap_level(target, datatype, comps,
0 /*border*/,
@@ -277,7 +277,7 @@ fallback_generate_mipmap(struct gl_context *ctx, GLenum
target,
dstWidth2); /* stride in texels */
/* compress the new image: dstTemp -> dstData */
- compress_image(format, datatype, dstTemp, dstData, dstWidth,
dstHeight, dstTrans->stride);
+ compress_image(format, datatype, dstTemp, dstData, dstWidth2,
dstHeight2, dstTrans->stride);
free(srcTemp);
free(dstTemp);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
