From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 19 Dec 2019 16:12:25 +0000 (-0500)
Subject: pan/midgard: Fix crash with txs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da73651da420390897b31c062a23355b8ec1680a;p=mesa.git

pan/midgard: Fix crash with txs

This regressed since we implemented RECT textures natively, oops.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3169>
---

diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index f332335cdd4..ab62770c69e 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -1165,7 +1165,9 @@ emit_ubo_read(
 
         midgard_instruction ins = m_ld_ubo_int4(dest, 0);
         ins.constants[0] = offset;
-        mir_set_intr_mask(instr, &ins, true);
+
+        if (instr->type == nir_instr_type_intrinsic)
+                mir_set_intr_mask(instr, &ins, true);
 
         if (indirect_offset) {
                 ins.src[2] = nir_src_index(ctx, indirect_offset);