summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-05-06 14:24:45 -0600
committerBrian Paul <brianp@vmware.com>2010-05-06 14:26:58 -0600
commitc37d8259bb26a97689d66b49456a7a13fac26a63 (patch)
tree0a24b5337daed8147909f259ef7a428e342cdad2 /src
parent4b59d2ba22fe73a912e4a8764ff6d4d440efc7d3 (diff)
st/mesa: fix compressed mipmap generation for small image sizes
When the mipmap level is smaller than the compression block width, height we need to fill in / replicate pixels so that we don't get garbage values. Fixes piglit gen-compressed-teximage test.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_gen_mipmap.c26
1 files changed, 24 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c
index 8acf616049..701c8e54e6 100644
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@ -105,10 +105,32 @@ decompress_image(enum pipe_format format,
unsigned width, unsigned height)
{
const struct util_format_description *desc = util_format_description(format);
- const uint dst_stride = 4 * width;
+ const uint bw = util_format_get_blockwidth(format);
+ const uint bh = util_format_get_blockheight(format);
+ const uint dst_stride = 4 * MAX2(width, bw);
const uint src_stride = util_format_get_stride(format, width);
desc->unpack_rgba_8unorm(dst, dst_stride, src, src_stride, width, height);
+
+ if (width < bw || height < bh) {
+ /* We're decompressing an image smaller than the compression
+ * block size. We don't want garbage pixel values in the region
+ * outside (width x height) so replicate pixels from the (width
+ * x height) region to fill out the (bw x bh) block size.
+ */
+ uint x, y;
+ for (y = 0; y < bh; y++) {
+ for (x = 0; x < bw; x++) {
+ if (x >= width || y >= height) {
+ uint p = (y * bw + x) * 4;
+ dst[p + 0] = dst[0];
+ dst[p + 1] = dst[1];
+ dst[p + 2] = dst[2];
+ dst[p + 3] = dst[3];
+ }
+ }
+ }
+ }
}
@@ -222,7 +244,7 @@ fallback_generate_mipmap(GLcontext *ctx, GLenum target,
dstWidth2); /* stride in texels */
/* compress the new image: dstTemp -> dstData */
- compress_image(format, dstTemp, dstData, dstWidth2, dstHeight2);
+ compress_image(format, dstTemp, dstData, dstWidth, dstHeight);
free(srcTemp);
free(dstTemp);