diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-13 10:11:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-13 10:11:58 +0200 |
| commit | f0a7d1d88be0c31bd471f4428c4493a93f2d9321 (patch) | |
| tree | 15b5078011dc751f9c1a1bb21e51dc2e600ee205 /mesalib/src/mesa/main/formats.c | |
| parent | 165450290d6c26756ede118f52ba2164abce7c9a (diff) | |
| download | vcxsrv-f0a7d1d88be0c31bd471f4428c4493a93f2d9321.tar.gz vcxsrv-f0a7d1d88be0c31bd471f4428c4493a93f2d9321.tar.bz2 vcxsrv-f0a7d1d88be0c31bd471f4428c4493a93f2d9321.zip | |
xserver mesa git update 13 Jul 2012
Diffstat (limited to 'mesalib/src/mesa/main/formats.c')
| -rw-r--r-- | mesalib/src/mesa/main/formats.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c index ccc0b1707..c65c9c2e1 100644 --- a/mesalib/src/mesa/main/formats.c +++ b/mesalib/src/mesa/main/formats.c @@ -1860,8 +1860,7 @@ _mesa_format_image_size(gl_format format, GLsizei width, 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; + return sz * depth; } else { /* non-compressed */ @@ -1887,8 +1886,7 @@ _mesa_format_image_size64(gl_format format, GLsizei width, const uint64_t wblocks = (width + bw - 1) / bw; const uint64_t hblocks = (height + bh - 1) / bh; const uint64_t sz = wblocks * hblocks * info->BytesPerBlock; - assert(depth == 1); - return sz; + return sz * depth; } else { /* non-compressed */ |