Module: Mesa Branch: master Commit: da73651da420390897b31c062a23355b8ec1680a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=da73651da420390897b31c062a23355b8ec1680a
Author: Alyssa Rosenzweig <[email protected]> Date: Thu Dec 19 11:12:25 2019 -0500 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> --- src/panfrost/midgard/midgard_compile.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
