From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Thu, 28 Mar 2019 01:59:02 +0000 (+0000)
Subject: panfrost/decode: Decode all cubemap faces
X-Git-Tag: android-x86-9.0-r1~7773
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3197b30c6e199f52f1293065f2650386b97d2e3d;p=android-x86%2Fexternal-mesa.git

panfrost/decode: Decode all cubemap faces

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
---

diff --git a/src/gallium/drivers/panfrost/pandecode/decode.c b/src/gallium/drivers/panfrost/pandecode/decode.c
index 86fb968e334..966bce6ebd7 100644
--- a/src/gallium/drivers/panfrost/pandecode/decode.c
+++ b/src/gallium/drivers/panfrost/pandecode/decode.c
@@ -1463,7 +1463,13 @@ pandecode_replay_vertex_tiler_postfix_pre(const struct mali_vertex_tiler_postfix
                                         pandecode_log(".swizzled_bitmaps = {\n");
                                         pandecode_indent++;
 
-                                        int bitmap_count = 1 + t->nr_mipmap_levels + t->unknown3A;
+                                        int bitmap_count = MALI_NEGATIVE(t->nr_mipmap_levels);
+
+                                        if (!f.is_not_cubemap) {
+                                                /* Miptree for each face */
+                                                bitmap_count *= 6;
+                                        }
+
                                         int max_count = sizeof(t->swizzled_bitmaps) / sizeof(t->swizzled_bitmaps[0]);
 
                                         if (bitmap_count > max_count) {