Mesa (main): radv: rename needs_multiview_view_index to uses_view_index

[GitLab Mirror]

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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Oct  6 14:18:01 2021 +0200

radv: rename needs_multiview_view_index to uses_view_index

To avoid confusion with radv_pipeline_key::has_multiview_view_index.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13243>

---

 src/amd/vulkan/radv_shader.h      | 2 +-
 src/amd/vulkan/radv_shader_args.c | 8 ++++----
 src/amd/vulkan/radv_shader_info.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index d6c9f9dc197..6ac206f5957 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -221,7 +221,7 @@ struct radv_shader_info {
    bool has_only_32bit_push_constants;
    bool has_indirect_push_constants;
    uint32_t desc_set_used_mask;
-   bool needs_multiview_view_index;
+   bool uses_view_index;
    bool uses_invocation_id;
    bool uses_prim_id;
    uint8_t wave_size;
diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c
index 28659b751b5..d42586dfd5f 100644
--- a/src/amd/vulkan/radv_shader_args.c
+++ b/src/amd/vulkan/radv_shader_args.c
@@ -79,22 +79,22 @@ needs_view_index_sgpr(struct radv_shader_args *args, gl_shader_stage stage)
 {
    switch (stage) {
    case MESA_SHADER_VERTEX:
-      if (args->shader_info->needs_multiview_view_index ||
+      if (args->shader_info->uses_view_index ||
           (!args->shader_info->vs.as_es && !args->shader_info->vs.as_ls &&
            args->options->key.has_multiview_view_index))
          return true;
       break;
    case MESA_SHADER_TESS_EVAL:
-      if (args->shader_info->needs_multiview_view_index ||
+      if (args->shader_info->uses_view_index ||
           (!args->shader_info->tes.as_es && args->options->key.has_multiview_view_index))
          return true;
       break;
    case MESA_SHADER_TESS_CTRL:
-      if (args->shader_info->needs_multiview_view_index)
+      if (args->shader_info->uses_view_index)
          return true;
       break;
    case MESA_SHADER_GEOMETRY:
-      if (args->shader_info->needs_multiview_view_index ||
+      if (args->shader_info->uses_view_index ||
           (args->shader_info->is_ngg && args->options->key.has_multiview_view_index))
          return true;
       break;
diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 9db8dccf57e..fe62163319a 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -218,7 +218,7 @@ gather_intrinsic_info(const nir_shader *nir, const nir_intrinsic_instr *instr,
       info->ps.reads_sample_pos_mask = nir_ssa_def_components_read(&instr->dest.ssa);
       break;
    case nir_intrinsic_load_view_index:
-      info->needs_multiview_view_index = true;
+      info->uses_view_index = true;
       break;
    case nir_intrinsic_load_invocation_id:
       info->uses_invocation_id = true;