Mesa (master): mesa: add assertion and update comment in _mesa_format_image_size()
Brian Paul
brianp at kemper.freedesktop.org
Wed Nov 24 19:12:20 UTC 2010
Module: Mesa
Branch: master
Commit: 7bfbd88d2cc4c7e7c1c2fe02b0d223f4a3ea8db2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7bfbd88d2cc4c7e7c1c2fe02b0d223f4a3ea8db2
Author: Brian Paul <brianp at vmware.com>
Date: Wed Nov 24 10:24:17 2010 -0700
mesa: add assertion and update comment in _mesa_format_image_size()
---
src/mesa/main/formats.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 88a04e8..f689d99 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 {
More information about the mesa-commit
mailing list