Mesa (master): pan/mdg: Invert the type conditional for load intrinsics

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 684e5aa5b8b59814555103384225dcfad159e606
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=684e5aa5b8b59814555103384225dcfad159e606

Author: Icecream95 <ixn at disroot.org>
Date:   Fri Jan  1 01:59:27 2021 +1300

pan/mdg: Invert the type conditional for load intrinsics

There are now more intrinsics for which nir_type_uint is forced than
where the destination type is used to find the intrinsic type, so
invert the conditional so that nir_type_uint is the default case when
nothing more specific is given.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8264>

---

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

diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index 2e838c14fcb..6e325897c22 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -1517,9 +1517,9 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr)
                 /* Get the base type of the intrinsic */
                 /* TODO: Infer type? Does it matter? */
                 nir_alu_type t =
-                        (is_ubo || is_global || is_shared || is_kernel) ? nir_type_uint :
                         (is_interp) ? nir_type_float :
-                        nir_intrinsic_dest_type(instr);
+                        (is_uniform || is_flat) ? nir_intrinsic_dest_type(instr) :
+                        nir_type_uint;
 
                 t = nir_alu_type_get_base_type(t);