diff options
| author | Eric Anholt <eric@anholt.net> | 2011-12-01 14:35:18 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-12-02 15:28:44 -0800 |
| commit | 1e0b6a90d78ed78eb9e22c65abd5af314142a844 (patch) | |
| tree | dbddf08294eabe837e7328f52368e8ebe57f9111 | |
| parent | bda361e0d47a670f318664abcdf0a065bef22883 (diff) | |
mesa: Fix glCompressedTexSubImage (and non-Sub) for height == 2 or 1.
Generally this code works with width and height aligned to compressed
blocks, but at the 2x2 and 1x1 levels of a square texture (or height <
bh in general), we were skipping uploading our single row of blocks.
Fixes piglit compressedteximage GL_COMPRESSED_RGBA_S3TC_DXT5_EXT.
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/mesa/main/texstore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 237f920793b..99adf799f62 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -5139,7 +5139,7 @@ _mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target, if (dstMap) { bytesPerRow = srcRowStride; /* bytes per row of blocks */ - rows = height / bh; /* rows in blocks */ + rows = (height + bh - 1) / bh; /* rows in blocks */ /* copy rows of blocks */ for (i = 0; i < rows; i++) { |