Mesa (main): intel/compiler: Make MUE available when setting up FS URB access

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 09dd05a21993c2a553e06f0db9dcf0b92b06d8fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09dd05a21993c2a553e06f0db9dcf0b92b06d8fa

Author: Caio Oliveira <caio.oliveira at intel.com>
Date:   Tue May 18 11:05:33 2021 -0700

intel/compiler: Make MUE available when setting up FS URB access

Allows to assert its existence for per-primitive variables and will
later be useful to implement the "more than 16 attributes" case for
Mesh.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13661>

---

 src/intel/compiler/brw_compiler.h |  2 ++
 src/intel/compiler/brw_fs.cpp     | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index 268ee5c64b6..9e6dab8b6b3 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -1652,7 +1652,9 @@ struct brw_compile_fs_params {
 
    const struct brw_wm_prog_key *key;
    struct brw_wm_prog_data *prog_data;
+
    const struct brw_vue_map *vue_map;
+   const struct brw_mue_map *mue_map;
 
    bool shader_time;
    int shader_time_index8;
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index d12eeba6e7c..e60e1bcd121 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -1865,7 +1865,8 @@ static void
 calculate_urb_setup(const struct intel_device_info *devinfo,
                     const struct brw_wm_prog_key *key,
                     struct brw_wm_prog_data *prog_data,
-                    const nir_shader *nir)
+                    const nir_shader *nir,
+                    const struct brw_mue_map *mue_map)
 {
    memset(prog_data->urb_setup, -1,
           sizeof(prog_data->urb_setup[0]) * VARYING_SLOT_MAX);
@@ -1877,6 +1878,7 @@ calculate_urb_setup(const struct intel_device_info *devinfo,
     * real HW registers.
     */
    if (nir->info.per_primitive_inputs) {
+      assert(mue_map);
       for (unsigned i = 0; i < VARYING_SLOT_MAX; i++) {
          if (nir->info.per_primitive_inputs & BITFIELD64_BIT(i)) {
             prog_data->urb_setup[i] = urb_next++;
@@ -1922,6 +1924,7 @@ calculate_urb_setup(const struct intel_device_info *devinfo,
           * number of outputs in Mesh (hence a lot of inputs in Fragment)
           * should already trigger this.
           */
+         assert(mue_map == NULL);
 
          /* Re-compute the VUE map here in the case that the one coming from
           * geometry has more than one position slot (used for Primitive
@@ -9794,7 +9797,8 @@ static void
 brw_nir_populate_wm_prog_data(const nir_shader *shader,
                               const struct intel_device_info *devinfo,
                               const struct brw_wm_prog_key *key,
-                              struct brw_wm_prog_data *prog_data)
+                              struct brw_wm_prog_data *prog_data,
+                              const struct brw_mue_map *mue_map)
 {
    /* key->alpha_test_func means simulating alpha testing via discards,
     * so the shader definitely kills pixels.
@@ -9857,7 +9861,7 @@ brw_nir_populate_wm_prog_data(const nir_shader *shader,
       BITSET_TEST(shader->info.system_values_read, SYSTEM_VALUE_FRAG_COORD) &&
       prog_data->per_coarse_pixel_dispatch;
 
-   calculate_urb_setup(devinfo, key, prog_data, shader);
+   calculate_urb_setup(devinfo, key, prog_data, shader, mue_map);
    brw_compute_flat_inputs(prog_data, shader);
 }
 
@@ -9915,7 +9919,8 @@ brw_compile_fs(const struct brw_compiler *compiler,
    brw_postprocess_nir(nir, compiler, true, debug_enabled,
                        key->base.robust_buffer_access);
 
-   brw_nir_populate_wm_prog_data(nir, compiler->devinfo, key, prog_data);
+   brw_nir_populate_wm_prog_data(nir, compiler->devinfo, key, prog_data,
+                                 params->mue_map);
 
    fs_visitor *v8 = NULL, *v16 = NULL, *v32 = NULL;
    cfg_t *simd8_cfg = NULL, *simd16_cfg = NULL, *simd32_cfg = NULL;