From: Marek Olšák <maraeo@gmail.com>
Date: Sun, 8 Jul 2012 17:24:37 +0000 (+0200)
Subject: mesa: remove assertions that do not allow compressed 2D_ARRAY textures
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=13b0af721a6ff9e98d47a2c0a740fe843c034016;p=mesa.git

mesa: remove assertions that do not allow compressed 2D_ARRAY textures

NOTE: This is a candidate for the 8.0 branch.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index ccc0b17075a..c65c9c2e14f 100644
--- a/src/mesa/main/formats.c
+++ b/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 */