From: Dave Airlie <airl...@redhat.com>
I was going to have to add another parameter to this monster,
so we should just pass the nir_variable in, I can't find any
reason this would be a bad idea.
This needed for the next fix.
Fixes: 94f9591995 (radv/ac: add support for TCS/TES inputs/outputs.)
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
src/amd/common/ac_nir_to_llvm.c | 21 ++++++++-------------
src/amd/common/ac_shader_abi.h | 8 +++-----
src/gallium/drivers/radeonsi/si_shader.c | 9 ++++-----
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index a8ecaaac474..600b6f72167 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -2864,18 +2864,18 @@ load_tcs_varyings(struct ac_shader_abi *abi,
static void
store_tcs_output(struct ac_shader_abi *abi,
+ const nir_variable *var,
LLVMValueRef vertex_index,
LLVMValueRef param_index,
unsigned const_index,
- unsigned location,
- unsigned driver_location,
LLVMValueRef src,
- unsigned component,
- bool is_patch,
- bool is_compact,
unsigned writemask)
{
struct radv_shader_context *ctx = radv_shader_context_from_abi(abi);
+ const unsigned location = var->data.location;
+ const unsigned component = var->data.location_frac;
+ const bool is_patch = var->data.patch;
+ const bool is_compact = var->data.compact;
LLVMValueRef dw_addr;
LLVMValueRef stride = NULL;
LLVMValueRef buf_addr = NULL;
@@ -3244,19 +3244,14 @@ visit_store_var(struct ac_nir_context *ctx,
LLVMValueRef vertex_index = NULL;
LLVMValueRef indir_index = NULL;
unsigned const_index = 0;
- const unsigned location =
instr->variables[0]->var->data.location;
- const unsigned driver_location =
instr->variables[0]->var->data.driver_location;
- const unsigned comp =
instr->variables[0]->var->data.location_frac;
const bool is_patch =
instr->variables[0]->var->data.patch;
- const bool is_compact =
instr->variables[0]->var->data.compact;
-
get_deref_offset(ctx, instr->variables[0],
false, NULL, is_patch ? NULL :
&vertex_index,
&const_index, &indir_index);
- ctx->abi->store_tcs_outputs(ctx->abi, vertex_index,
indir_index,
- const_index, location,
driver_location,
- src, comp, is_patch,
is_compact, writemask);
+ ctx->abi->store_tcs_outputs(ctx->abi,
instr->variables[0]->var,
+ vertex_index, indir_index,
+ const_index, src,
writemask);
return;
}
diff --git a/src/amd/common/ac_shader_abi.h b/src/amd/common/ac_shader_abi.h
index 09fe32c1363..4568c24dc5f 100644
--- a/src/amd/common/ac_shader_abi.h
+++ b/src/amd/common/ac_shader_abi.h
@@ -28,6 +28,8 @@
#include "compiler/shader_enums.h"
+struct nir_variable;
+
#define AC_LLVM_MAX_OUTPUTS (VARYING_SLOT_VAR31 + 1)
enum ac_descriptor_type {
@@ -109,15 +111,11 @@ struct ac_shader_abi {
bool load_inputs);
void (*store_tcs_outputs)(struct ac_shader_abi *abi,
+ const struct nir_variable *var,
LLVMValueRef vertex_index,
LLVMValueRef param_index,
unsigned const_index,
- unsigned location,
- unsigned driver_location,
LLVMValueRef src,
- unsigned component,
- bool is_patch,
- bool is_compact,
unsigned writemask);
LLVMValueRef (*load_tess_coord)(struct ac_shader_abi *abi);
diff --git a/src/gallium/drivers/radeonsi/si_shader.c
b/src/gallium/drivers/radeonsi/si_shader.c
index 2a50b266f64..ecb05d3c5c7 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1487,19 +1487,18 @@ static void store_output_tcs(struct
lp_build_tgsi_context *bld_base,
}
static void si_nir_store_output_tcs(struct ac_shader_abi *abi,
+ const struct nir_variable *var,
LLVMValueRef vertex_index,
LLVMValueRef param_index,
unsigned const_index,
- unsigned location,
- unsigned driver_location,
LLVMValueRef src,
- unsigned component,
- bool is_patch,
- bool is_compact,
unsigned writemask)
{
struct si_shader_context *ctx = si_shader_context_from_abi(abi);
struct tgsi_shader_info *info = &ctx->shader->selector->info;
+ const unsigned component = var->data.location_frac;
+ const bool is_patch = var->data.patch;
+ unsigned driver_location = var->data.driver_location;
LLVMValueRef dw_addr, stride;
LLVMValueRef buffer, base, addr;
LLVMValueRef values[4];
--
2.14.3
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
