From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 15 Nov 2019 19:13:18 +0000 (-0500)
Subject: pan/midgard: Implement non-aligned UBOs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2236904f722d02d82232cf02f8160c2c5315c711;p=mesa.git

pan/midgard: Implement non-aligned UBOs

The field is more fine-grained than we had assumed.

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

diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index bf794997796..19573900bd9 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -1131,12 +1131,9 @@ emit_ubo_read(
 
         midgard_instruction ins = m_ld_ubo_int4(dest, offset);
 
-        assert((offset & 0xF) == 0);
-        offset /= 16;
-
         /* TODO: Don't split */
-        ins.load_store.varying_parameters = (offset & 7) << 7;
-        ins.load_store.address = offset >> 3;
+        ins.load_store.varying_parameters = (offset & 0x7F) << 3;
+        ins.load_store.address = offset >> 7;
         ins.mask = mir_mask_for_intr(instr, true);
 
         if (indirect_offset) {