summaryrefslogtreecommitdiffstats
path: root/src/panfrost/midgard
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <[email protected]>2019-12-19 11:12:25 -0500
committerTomeu Vizoso <[email protected]>2019-12-20 09:10:36 +0100
commitda73651da420390897b31c062a23355b8ec1680a (patch)
tree99004e7251ae5d2fa2e74c8c214f4187f2a3f90a /src/panfrost/midgard
parentccbc9a4e6785babb832bf11499fe7538c2a30952 (diff)
pan/midgard: Fix crash with txs
This regressed since we implemented RECT textures natively, oops. Signed-off-by: Alyssa Rosenzweig <[email protected]> Reviewed-by: Tomeu Vizoso <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3169>
Diffstat (limited to 'src/panfrost/midgard')
-rw-r--r--src/panfrost/midgard/midgard_compile.c4
1 files changed, 3 insertions, 1 deletions
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);