Mesa (master): pan/mdg: Support nir_intrinsic_load_global_constant

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jan 1 03:14:23 UTC 2021


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

Author: Icecream95 <ixn at disroot.org>
Date:   Tue Dec 29 00:57:42 2020 +1300

pan/mdg: Support nir_intrinsic_load_global_constant

Treat it the same as nir_intrinsic_load_global.

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, 3 insertions(+), 1 deletion(-)

diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index eea01a8525e..6022584b5a9 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -1500,13 +1500,15 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr)
         case nir_intrinsic_load_uniform:
         case nir_intrinsic_load_ubo:
         case nir_intrinsic_load_global:
+        case nir_intrinsic_load_global_constant:
         case nir_intrinsic_load_shared:
         case nir_intrinsic_load_input:
         case nir_intrinsic_load_kernel_input:
         case nir_intrinsic_load_interpolated_input: {
                 bool is_uniform = instr->intrinsic == nir_intrinsic_load_uniform;
                 bool is_ubo = instr->intrinsic == nir_intrinsic_load_ubo;
-                bool is_global = instr->intrinsic == nir_intrinsic_load_global;
+                bool is_global = instr->intrinsic == nir_intrinsic_load_global ||
+                        instr->intrinsic == nir_intrinsic_load_global_constant;
                 bool is_shared = instr->intrinsic == nir_intrinsic_load_shared;
                 bool is_flat = instr->intrinsic == nir_intrinsic_load_input;
                 bool is_kernel = instr->intrinsic == nir_intrinsic_load_kernel_input;



More information about the mesa-commit mailing list