nir/lower_input_attachments: Refactor to use an options struct

While we're at it, fold the details of how to load the fragcoord into
load_fragcoord().

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5719>

diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index f3ea88b4e814086f992addd70659709d6147ca7b..160ec595ab0154fab05a7e1eb23244a8adabc115 100644 (file)
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -505,7 +505,10 @@ radv_shader_compile_to_nir(struct radv_device *device,
                    !radv_use_llvm_for_stage(device, nir->info.stage))
                         NIR_PASS_V(nir, nir_lower_io_to_vector, nir_var_shader_out);
                if (nir->info.stage == MESA_SHADER_FRAGMENT)
                    !radv_use_llvm_for_stage(device, nir->info.stage))
                         NIR_PASS_V(nir, nir_lower_io_to_vector, nir_var_shader_out);
                if (nir->info.stage == MESA_SHADER_FRAGMENT)

-                       NIR_PASS_V(nir, nir_lower_input_attachments, true);
+                       NIR_PASS_V(nir, nir_lower_input_attachments,
+                                  &(nir_input_attachment_options) {
+                                       .use_fragcoord_sysval = true,
+                                  });

 
                NIR_PASS_V(nir, nir_remove_dead_variables,
                           nir_var_shader_in | nir_var_shader_out | nir_var_system_value | nir_var_mem_shared,
 
                NIR_PASS_V(nir, nir_remove_dead_variables,
                           nir_var_shader_in | nir_var_shader_out | nir_var_system_value | nir_var_mem_shared,

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 083bdf207f42b073bbc9bf13192c43fe3292fed2..7a109cb95cb080b1c9533dacc2037c06fe3fd820 100644 (file)
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -4458,7 +4458,12 @@ enum nir_lower_idiv_path {
 
 bool nir_lower_idiv(nir_shader *shader, enum nir_lower_idiv_path path);
 
 
 bool nir_lower_idiv(nir_shader *shader, enum nir_lower_idiv_path path);
 

-bool nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval);
+typedef struct nir_input_attachment_options {
+   bool use_fragcoord_sysval;
+} nir_input_attachment_options;
+
+bool nir_lower_input_attachments(nir_shader *shader,
+                                 const nir_input_attachment_options *options);

 
 bool nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables,
                        bool use_vars,
 
 bool nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables,
                        bool use_vars,

diff --git a/src/compiler/nir/nir_lower_input_attachments.c b/src/compiler/nir/nir_lower_input_attachments.c
index 20fa801b45d4abe169a1210be73fc30f1c4ec18f..2e6e56806ee6bf82e078a597c88b0315987ed275 100644 (file)
--- a/src/compiler/nir/nir_lower_input_attachments.c
+++ b/src/compiler/nir/nir_lower_input_attachments.c
@@ -25,8 +25,11 @@
 #include "nir_builder.h"
 
 static nir_ssa_def *
 #include "nir_builder.h"
 
 static nir_ssa_def *

-load_frag_coord(nir_builder *b)
+load_frag_coord(const nir_input_attachment_options *options, nir_builder *b)

 {
 {

+   if (options->use_fragcoord_sysval)
+      return nir_load_frag_coord(b);
+

    nir_variable *pos =
       nir_find_variable_with_location(b->shader, nir_var_shader_in,
                                       VARYING_SLOT_POS);
    nir_variable *pos =
       nir_find_variable_with_location(b->shader, nir_var_shader_in,
                                       VARYING_SLOT_POS);


@@ -49,7 +52,7 @@ load_frag_coord(nir_builder *b)
 
 static bool
 try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,
 
 static bool
 try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,

-                     bool use_fragcoord_sysval)
+                     const nir_input_attachment_options *options)

 {
    nir_deref_instr *deref = nir_src_as_deref(load->src[0]);
    assert(glsl_type_is_image(deref->type));
 {
    nir_deref_instr *deref = nir_src_as_deref(load->src[0]);
    assert(glsl_type_is_image(deref->type));


@@ -65,8 +68,7 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,
    nir_builder_init(&b, impl);
    b.cursor = nir_instr_remove(&load->instr);
 
    nir_builder_init(&b, impl);
    b.cursor = nir_instr_remove(&load->instr);
 

-   nir_ssa_def *frag_coord = use_fragcoord_sysval ? nir_load_frag_coord(&b)
-                                                  : load_frag_coord(&b);
+   nir_ssa_def *frag_coord = load_frag_coord(options, &b);

    frag_coord = nir_f2i32(&b, frag_coord);
    nir_ssa_def *offset = nir_ssa_for_src(&b, load->src[1], 2);
    nir_ssa_def *pos = nir_iadd(&b, frag_coord, offset);
    frag_coord = nir_f2i32(&b, frag_coord);
    nir_ssa_def *offset = nir_ssa_for_src(&b, load->src[1], 2);
    nir_ssa_def *pos = nir_iadd(&b, frag_coord, offset);


@@ -128,7 +130,7 @@ try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load,
 
 static bool
 try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,
 
 static bool
 try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,

-                                                        bool use_fragcoord_sysval)
+                      const nir_input_attachment_options *options)

 {
    nir_deref_instr *deref = nir_src_as_deref(tex->src[0].src);
 
 {
    nir_deref_instr *deref = nir_src_as_deref(tex->src[0].src);
 


@@ -139,8 +141,7 @@ try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,
    nir_builder_init(&b, impl);
    b.cursor = nir_before_instr(&tex->instr);
 
    nir_builder_init(&b, impl);
    b.cursor = nir_before_instr(&tex->instr);
 

-   nir_ssa_def *frag_coord = use_fragcoord_sysval ? nir_load_frag_coord(&b)
-                                                  : load_frag_coord(&b);
+   nir_ssa_def *frag_coord = load_frag_coord(options, &b);

    frag_coord = nir_f2i32(&b, frag_coord);
 
    nir_ssa_def *layer = nir_load_layer_id(&b);
    frag_coord = nir_f2i32(&b, frag_coord);
 
    nir_ssa_def *layer = nir_load_layer_id(&b);


@@ -155,7 +156,8 @@ try_lower_input_texop(nir_function_impl *impl, nir_tex_instr *tex,
 }
 
 bool
 }
 
 bool

-nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval)
+nir_lower_input_attachments(nir_shader *shader,
+                            const nir_input_attachment_options *options)

 {
    assert(shader->info.stage == MESA_SHADER_FRAGMENT);
    bool progress = false;
 {
    assert(shader->info.stage == MESA_SHADER_FRAGMENT);
    bool progress = false;


@@ -173,7 +175,7 @@ nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval)
                if (tex->op == nir_texop_fragment_mask_fetch ||
                    tex->op == nir_texop_fragment_fetch) {
                   progress |= try_lower_input_texop(function->impl, tex,
                if (tex->op == nir_texop_fragment_mask_fetch ||
                    tex->op == nir_texop_fragment_fetch) {
                   progress |= try_lower_input_texop(function->impl, tex,

-                                                    use_fragcoord_sysval);
+                                                    options);

                }
                break;
             }
                }
                break;
             }


@@ -182,7 +184,7 @@ nir_lower_input_attachments(nir_shader *shader, bool use_fragcoord_sysval)
 
                if (load->intrinsic == nir_intrinsic_image_deref_load) {
                   progress |= try_lower_input_load(function->impl, load,
 
                if (load->intrinsic == nir_intrinsic_image_deref_load) {
                   progress |= try_lower_input_load(function->impl, load,

-                                                   use_fragcoord_sysval);
+                                                   options);

                }
                break;
             }
                }
                break;
             }

diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c
index 7f17706cdc90c9844efe822abc3e82d4923315a5..48b686a732979770d824a5ed4a4046f6b4b8c72e 100644 (file)
--- a/src/freedreno/vulkan/tu_shader.c
+++ b/src/freedreno/vulkan/tu_shader.c
@@ -770,8 +770,12 @@ tu_shader_create(struct tu_device *dev,
    NIR_PASS_V(nir, nir_lower_system_values);
    NIR_PASS_V(nir, nir_lower_frexp);
 
    NIR_PASS_V(nir, nir_lower_system_values);
    NIR_PASS_V(nir, nir_lower_frexp);
 

-   if (stage == MESA_SHADER_FRAGMENT)
-      NIR_PASS_V(nir, nir_lower_input_attachments, true);
+   if (stage == MESA_SHADER_FRAGMENT) {
+      NIR_PASS_V(nir, nir_lower_input_attachments,
+                 &(nir_input_attachment_options) {
+                     .use_fragcoord_sysval = true,
+                 });
+   }

 
    NIR_PASS_V(nir, nir_lower_explicit_io,
               nir_var_mem_ubo | nir_var_mem_ssbo,
 
    NIR_PASS_V(nir, nir_lower_explicit_io,
               nir_var_mem_ubo | nir_var_mem_ssbo,

diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 845451f7fc213f9a4c04a2f9bd5e6ab6f3ee6b0f..cfae90f10a8340c8c93818ead76948805e05ecac 100644 (file)
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -744,7 +744,10 @@ anv_pipeline_lower_nir(struct anv_pipeline *pipeline,
    if (nir->info.stage == MESA_SHADER_FRAGMENT) {
       NIR_PASS_V(nir, nir_lower_wpos_center,
                  anv_pipeline_to_graphics(pipeline)->sample_shading_enable);
    if (nir->info.stage == MESA_SHADER_FRAGMENT) {
       NIR_PASS_V(nir, nir_lower_wpos_center,
                  anv_pipeline_to_graphics(pipeline)->sample_shading_enable);

-      NIR_PASS_V(nir, nir_lower_input_attachments, true);
+      NIR_PASS_V(nir, nir_lower_input_attachments,
+                 &(nir_input_attachment_options) {
+                     .use_fragcoord_sysval = true,
+                 });

    }
 
    NIR_PASS_V(nir, anv_nir_lower_ycbcr_textures, layout);
    }
 
    NIR_PASS_V(nir, anv_nir_lower_ycbcr_textures, layout);