Mesa (main): pan/midg: Fix the upper/lower limit on 8bit vectors

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: da474d5d14f5b159272abc27c3dd5ea84faa15b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=da474d5d14f5b159272abc27c3dd5ea84faa15b3

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Thu Sep  9 10:36:03 2021 +0200

pan/midg: Fix the upper/lower limit on 8bit vectors

If I'm correct, the lower/upper split on 8bit vectors is 8, not 4.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14885>

---

 src/panfrost/midgard/midgard_emit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/midgard/midgard_emit.c b/src/panfrost/midgard/midgard_emit.c
index 3d8c61c792f..fc5fa8eb1d1 100644
--- a/src/panfrost/midgard/midgard_emit.c
+++ b/src/panfrost/midgard/midgard_emit.c
@@ -276,13 +276,13 @@ mir_pack_swizzle(unsigned mask, unsigned *swizzle,
                 for (unsigned c = (dest_up ? 4 : 0); c < (dest_up ? 8 : 4); ++c) {
                         unsigned v = swizzle[c];
 
-                        ASSERTED bool t_upper = v > 3;
+                        ASSERTED bool t_upper = v > (sz == 8 ? 7 : 3);
 
                         /* Ensure we're doing something sane */
 
                         if (mask & (1 << c)) {
                                 assert(t_upper == upper);
-                                assert(v <= 7);
+                                assert(v <= (sz == 8 ? 15 : 7));
                         }
 
                         /* Use the non upper part */