From 079bb3fff7104782f2c921200e9a299c38a53ab6 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 1 Dec 2011 14:52:44 -0800 Subject: mesa: Fix assertions for block size handling in glCompressedTexSubImage2D. Anything of less than (bw, bh) size is possible when you consider rectangular textures, and this code is (now) safe for those. Even for power-of-two textures, width could be 4 for FXT1 while not being aligned to block size. Fixes piglit compressedteximage GL_COMPRESSED_RGB_FXT1_3DFX Reviewed-by: Brian Paul --- src/mesa/main/texstore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 99adf799f62..37fea2156e6 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -5116,8 +5116,8 @@ _mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target, _mesa_get_format_block_size(texFormat, &bw, &bh); /* these should have been caught sooner */ - ASSERT((width % bw) == 0 || width == 2 || width == 1); - ASSERT((height % bh) == 0 || height == 2 || height == 1); + ASSERT((width % bw) == 0 || width < bw); + ASSERT((height % bh) == 0 || height < bh); ASSERT((xoffset % bw) == 0); ASSERT((yoffset % bh) == 0); -- cgit v1.2.3