broadcom/compiler: move uniform offset lowering from compiler to GL driver

We only need this in GL so move it there.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24396>

diff --git a/src/broadcom/compiler/v3d_nir_lower_io.c b/src/broadcom/compiler/v3d_nir_lower_io.c
index 3ef0e39..ca0ffd9 100644 (file)
--- a/src/broadcom/compiler/v3d_nir_lower_io.c
+++ b/src/broadcom/compiler/v3d_nir_lower_io.c
@@ -90,29 +90,6 @@ v3d_nir_store_output(nir_builder *b, int base, nir_ssa_def *offset,
         nir_store_output(b, chan, offset, .base = base, .write_mask = 0x1, .component = 0);
 }
 
-/* Convert the uniform offset to bytes.  If it happens to be a constant,
- * constant-folding will clean up the shift for us.
- */
-static void
-v3d_nir_lower_uniform(struct v3d_compile *c, nir_builder *b,
-                      nir_intrinsic_instr *intr)
-{
-        /* On SPIR-V/Vulkan we are already getting our offsets in
-         * bytes.
-         */
-        if (c->key->environment == V3D_ENVIRONMENT_VULKAN)
-                return;
-
-        b->cursor = nir_before_instr(&intr->instr);
-
-        nir_intrinsic_set_base(intr, nir_intrinsic_base(intr) * 16);
-
-        nir_instr_rewrite_src(&intr->instr,
-                              &intr->src[0],
-                              nir_src_for_ssa(nir_ishl_imm(b, intr->src[0].ssa,
-                                                           4)));
-}
-
 static int
 v3d_varying_slot_vpm_offset(struct v3d_compile *c, unsigned location, unsigned component)
 {
@@ -399,10 +376,6 @@ v3d_nir_lower_io_instr(struct v3d_compile *c, nir_builder *b,
                         v3d_nir_lower_fragment_input(c, b, intr);
                 break;
 
-        case nir_intrinsic_load_uniform:
-                v3d_nir_lower_uniform(c, b, intr);
-                break;
-
         case nir_intrinsic_store_output:
                 if (c->s->info.stage == MESA_SHADER_VERTEX ||
                     c->s->info.stage == MESA_SHADER_GEOMETRY) {

diff --git a/src/gallium/drivers/v3d/v3d_program.c b/src/gallium/drivers/v3d/v3d_program.c
index f7712ec..6c49d63 100644 (file)
--- a/src/gallium/drivers/v3d/v3d_program.c
+++ b/src/gallium/drivers/v3d/v3d_program.c
@@ -287,6 +287,33 @@ v3d_shader_precompile(struct v3d_context *v3d,
         }
 }
 
+static bool
+lower_uniform_offset_to_bytes_cb(nir_builder *b, nir_instr *instr, void *_state)
+{
+        if (instr->type != nir_instr_type_intrinsic)
+                return false;
+
+        nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
+        if (intr->intrinsic != nir_intrinsic_load_uniform)
+                return false;
+
+        b->cursor = nir_before_instr(&intr->instr);
+        nir_intrinsic_set_base(intr, nir_intrinsic_base(intr) * 16);
+        nir_instr_rewrite_src(&intr->instr,
+                              &intr->src[0],
+                              nir_src_for_ssa(nir_ishl_imm(b, intr->src[0].ssa,
+                                                           4)));
+        return true;
+}
+
+static bool
+v3d_nir_lower_uniform_offset_to_bytes(nir_shader *s)
+{
+        return nir_shader_instructions_pass(s, lower_uniform_offset_to_bytes_cb,
+                                            nir_metadata_block_index |
+                                            nir_metadata_dominance, NULL);
+}
+
 static void *
 v3d_uncompiled_shader_create(struct pipe_context *pctx,
                              enum pipe_shader_ir type, void *ir)
@@ -339,6 +366,12 @@ v3d_uncompiled_shader_create(struct pipe_context *pctx,
 
         NIR_PASS(_, s, nir_lower_frexp);
 
+        /* Since we can't expose PIPE_CAP_PACKED_UNIFORMS the state tracker
+         * will produce uniform intrinsics with offsets in vec4 units but
+         * our compiler expects to work in units of bytes.
+         */
+        NIR_PASS(_, s, v3d_nir_lower_uniform_offset_to_bytes);
+
         /* Garbage collect dead instructions */
         nir_sweep(s);