From 7bfbd88d2cc4c7e7c1c2fe02b0d223f4a3ea8db2 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 24 Nov 2010 10:24:17 -0700 Subject: [PATCH] mesa: add assertion and update comment in _mesa_format_image_size() --- src/mesa/main/formats.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index 88a04e888e4..f689d99df8e 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -1057,11 +1057,12 @@ _mesa_format_image_size(gl_format format, GLsizei width, const struct gl_format_info *info = _mesa_get_format_info(format); /* Strictly speaking, a conditional isn't needed here */ if (info->BlockWidth > 1 || info->BlockHeight > 1) { - /* compressed format */ + /* compressed format (2D only for now) */ const GLuint bw = info->BlockWidth, bh = info->BlockHeight; const GLuint wblocks = (width + bw - 1) / bw; const GLuint hblocks = (height + bh - 1) / bh; const GLuint sz = wblocks * hblocks * info->BytesPerBlock; + assert(depth == 1); return sz; } else { -- 2.30.2