Commit 14f55a82 authored by Dave Airlie's avatar Dave Airlie Committed by Emil Velikov

ac/nir: pass the nir variable through tcs loading.

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: 94f95919 (radv/ac: add support for TCS/TES inputs/outputs.)
Reviewed-by: Bas Nieuwenhuizen's avatarBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
(cherry picked from commit 4f0c89d6)
[Emil Velikov: move hunk {radv,ac}_nir_to_llvm.c]
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>

Conflicts:
	src/amd/common/ac_nir_to_llvm.c
	src/amd/common/ac_shader_abi.h
	src/amd/vulkan/radv_nir_to_llvm.c
parent 82a426af
......@@ -2936,18 +2936,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 nir_to_llvm_context *ctx = nir_to_llvm_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;
......@@ -3307,19 +3307,15 @@ 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;
}
......
......@@ -26,6 +26,8 @@
#include <llvm-c/Core.h>
struct nir_variable;
enum ac_descriptor_type {
AC_DESC_IMAGE,
AC_DESC_FMASK,
......@@ -92,15 +94,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,
......
......@@ -1451,19 +1451,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];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment