fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-19 01:40:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ac: drop now useless lookup_interp_param from ABI

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Samuel Pitoiset 2019-07-31 09:57:47 +02:00
parent a63719db6a
commit 9f2fd23f99
4 changed files with 32 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/amd/common/ac_nir_to_llvm.c
View file

@ -3077,10 +3077,38 @@ static LLVMValueRef load_sample_pos(struct ac_nir_context *ctx)
return ac_build_gather_values(&ctx->ac, values, 2);
}
static LLVMValueRef lookup_interp_param(struct ac_nir_context *ctx,
enum glsl_interp_mode interp, unsigned location)
{
switch (interp) {
case INTERP_MODE_FLAT:
default:
return NULL;
case INTERP_MODE_SMOOTH:
case INTERP_MODE_NONE:
if (location == INTERP_CENTER)
return ctx->abi->persp_center;
else if (location == INTERP_CENTROID)
return ctx->abi->persp_centroid;
else if (location == INTERP_SAMPLE)
return ctx->abi->persp_sample;
break;
case INTERP_MODE_NOPERSPECTIVE:
if (location == INTERP_CENTER)
return ctx->abi->linear_center;
else if (location == INTERP_CENTROID)
return ctx->abi->linear_centroid;
else if (location == INTERP_SAMPLE)
return ctx->abi->linear_sample;
break;
}
return NULL;
}
static LLVMValueRef barycentric_center(struct ac_nir_context *ctx,
unsigned mode)
{
LLVMValueRef interp_param = ctx->abi->lookup_interp_param(ctx->abi, mode, INTERP_CENTER);
LLVMValueRef interp_param = lookup_interp_param(ctx, mode, INTERP_CENTER);
return LLVMBuildBitCast(ctx->ac.builder, interp_param, ctx->ac.v2i32, "");
}
@ -3088,7 +3116,7 @@ static LLVMValueRef barycentric_offset(struct ac_nir_context *ctx,
unsigned mode,
LLVMValueRef offset)
{
LLVMValueRef interp_param = ctx->abi->lookup_interp_param(ctx->abi, mode, INTERP_CENTER);
LLVMValueRef interp_param = lookup_interp_param(ctx, mode, INTERP_CENTER);
LLVMValueRef src_c0 = ac_to_float(&ctx->ac, LLVMBuildExtractElement(ctx->ac.builder, offset, ctx->ac.i32_0, ""));
LLVMValueRef src_c1 = ac_to_float(&ctx->ac, LLVMBuildExtractElement(ctx->ac.builder, offset, ctx->ac.i32_1, ""));
@ -3130,7 +3158,7 @@ static LLVMValueRef barycentric_offset(struct ac_nir_context *ctx,
static LLVMValueRef barycentric_centroid(struct ac_nir_context *ctx,
unsigned mode)
{
LLVMValueRef interp_param = ctx->abi->lookup_interp_param(ctx->abi, mode, INTERP_CENTROID);
LLVMValueRef interp_param = lookup_interp_param(ctx, mode, INTERP_CENTROID);
return LLVMBuildBitCast(ctx->ac.builder, interp_param, ctx->ac.v2i32, "");
}
@ -3160,7 +3188,7 @@ static LLVMValueRef barycentric_at_sample(struct ac_nir_context *ctx,
static LLVMValueRef barycentric_sample(struct ac_nir_context *ctx,
unsigned mode)
{
LLVMValueRef interp_param = ctx->abi->lookup_interp_param(ctx->abi, mode, INTERP_SAMPLE);
LLVMValueRef interp_param = lookup_interp_param(ctx, mode, INTERP_SAMPLE);
return LLVMBuildBitCast(ctx->ac.builder, interp_param, ctx->ac.v2i32, "");
}

4
src/amd/common/ac_shader_abi.h
View file

@ -196,10 +196,6 @@ struct ac_shader_abi {
unsigned desc_set,
unsigned binding);
LLVMValueRef (*lookup_interp_param)(struct ac_shader_abi *abi,
enum glsl_interp_mode interp,
unsigned location);
LLVMValueRef (*load_sample_position)(struct ac_shader_abi *abi,
LLVMValueRef sample_id);

31
src/amd/vulkan/radv_nir_to_llvm.c
View file

@ -1759,36 +1759,6 @@ static void radv_emit_kill(struct ac_shader_abi *abi, LLVMValueRef visible)
ac_build_kill_if_false(&ctx->ac, visible);
}
static LLVMValueRef lookup_interp_param(struct ac_shader_abi *abi,
enum glsl_interp_mode interp, unsigned location)
{
struct radv_shader_context *ctx = radv_shader_context_from_abi(abi);
switch (interp) {
case INTERP_MODE_FLAT:
default:
return NULL;
case INTERP_MODE_SMOOTH:
case INTERP_MODE_NONE:
if (location == INTERP_CENTER)
return ctx->abi.persp_center;
else if (location == INTERP_CENTROID)
return ctx->abi.persp_centroid;
else if (location == INTERP_SAMPLE)
return ctx->abi.persp_sample;
break;
case INTERP_MODE_NOPERSPECTIVE:
if (location == INTERP_CENTER)
return ctx->abi.linear_center;
else if (location == INTERP_CENTROID)
return ctx->abi.linear_centroid;
else if (location == INTERP_SAMPLE)
return ctx->abi.linear_sample;
break;
}
return NULL;
}
static uint32_t
radv_get_sample_pos_offset(uint32_t num_samples)
{
@ -4425,7 +4395,6 @@ LLVMModuleRef ac_translate_nir_to_llvm(struct ac_llvm_compiler *ac_llvm,
ctx.abi.load_base_vertex = radv_load_base_vertex;
} else if (shaders[i]->info.stage == MESA_SHADER_FRAGMENT) {
shader_info->fs.can_discard = shaders[i]->info.fs.uses_discard;
ctx.abi.lookup_interp_param = lookup_interp_param;
ctx.abi.load_sample_position = load_sample_position;
ctx.abi.load_sample_mask_in = load_sample_mask_in;
ctx.abi.emit_kill = radv_emit_kill;

1
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -6118,7 +6118,6 @@ static bool si_compile_tgsi_main(struct si_shader_context *ctx)
ctx->load_input = declare_input_fs;
ctx->abi.emit_outputs = si_llvm_return_fs_outputs;
bld_base->emit_epilogue = si_tgsi_emit_epilogue;
ctx->abi.lookup_interp_param = si_nir_lookup_interp_param;
ctx->abi.load_sample_position = load_sample_position;
ctx->abi.load_sample_mask_in = load_sample_mask_in;
ctx->abi.emit_fbfetch = si_nir_emit_fbfetch;