[Mesa-dev] [PATCH 38/92] ac/nir: add ac_shader_abi::inputs

[Nicolai Hähnle]

From: Nicolai Hähnle <nicolai.haeh...@amd.com>

---
 src/amd/common/ac_nir_to_llvm.c | 2 ++
 src/amd/common/ac_shader_abi.h  | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index ae16455..bd913e5 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -5982,20 +5982,22 @@ LLVMModuleRef 
ac_translate_nir_to_llvm(LLVMTargetMachineRef tm,
 
        ctx.num_output_clips = nir->info.clip_distance_array_size;
        ctx.num_output_culls = nir->info.cull_distance_array_size;
 
        nir_foreach_variable(variable, &nir->inputs)
                handle_shader_input_decl(&ctx, variable);
 
        if (nir->stage == MESA_SHADER_FRAGMENT)
                handle_fs_inputs_pre(&ctx, nir);
 
+       ctx.abi.inputs = &ctx.inputs[0];
+
        ac_nir_translate(&ctx.ac, &ctx.abi, nir, &ctx);
 
        LLVMBuildRetVoid(ctx.builder);
 
        ac_llvm_finalize_module(&ctx);
 
        ac_nir_eliminate_const_vs_outputs(&ctx);
 
        if (nir->stage == MESA_SHADER_GEOMETRY) {
                unsigned addclip = ctx.num_output_clips + ctx.num_output_culls 
> 4;
diff --git a/src/amd/common/ac_shader_abi.h b/src/amd/common/ac_shader_abi.h
index 4168177..16b63d1 100644
--- a/src/amd/common/ac_shader_abi.h
+++ b/src/amd/common/ac_shader_abi.h
@@ -26,13 +26,20 @@
 
 /* Document the shader ABI during compilation. This is what allows radeonsi and
  * radv to share a compiler backend.
  */
 struct ac_shader_abi {
        int param_base_vertex;
        int param_start_instance;
        int param_draw_id;
        int param_vertex_id;
        int param_instance_id;
+
+       /* For VS and PS: pre-loaded shader inputs.
+        *
+        * Currently only used for NIR shaders; indexed by variables'
+        * driver_location.
+        */
+       LLVMValueRef *inputs;
 };
 
 #endif /* AC_SHADER_ABI_H */
-- 
2.9.3

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev