fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: remove 2 callbacks from si_shader_context

Browse source 
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-09-05 13:01:43 +02:00
parent 1cda9a2fee
commit a0823df148
3 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1493,9 +1493,9 @@ static LLVMValueRef load_sample_position(struct si_shader_context *ctx, LLVMValu
return lp_build_gather_values(gallivm, pos, 4);
}
static void declare_system_value(struct si_shader_context *ctx,
unsigned index,
const struct tgsi_full_declaration *decl)
void si_load_system_value(struct si_shader_context *ctx,
unsigned index,
const struct tgsi_full_declaration *decl)
{
struct lp_build_context *bld = &ctx->bld_base.base;
struct gallivm_state *gallivm = &ctx->gallivm;
@ -1770,8 +1770,8 @@ static void declare_system_value(struct si_shader_context *ctx,
ctx->system_values[index] = value;
}
static void declare_compute_memory(struct si_shader_context *ctx,
const struct tgsi_full_declaration *decl)
void si_declare_compute_memory(struct si_shader_context *ctx,
const struct tgsi_full_declaration *decl)
{
struct si_shader_selector *sel = ctx->shader->selector;
struct gallivm_state *gallivm = &ctx->gallivm;
@ -5691,7 +5691,6 @@ static bool si_compile_tgsi_main(struct si_shader_context *ctx,
bld_base->emit_epilogue = si_tgsi_emit_epilogue;
break;
case PIPE_SHADER_COMPUTE:
ctx->declare_memory_region = declare_compute_memory;
break;
default:
assert(!"Unsupported shader type");
@ -6345,8 +6344,6 @@ int si_compile_tgsi_shader(struct si_screen *sscreen,
shader->info.uses_instanceid = sel->info.uses_instanceid;
ctx.load_system_value = declare_system_value;
if (!si_compile_tgsi_main(&ctx, is_monolithic)) {
si_llvm_dispose(&ctx);
return -1;

13
src/gallium/drivers/radeonsi/si_shader_internal.h
View file

@ -78,13 +78,6 @@ struct si_shader_context {
const struct tgsi_full_declaration *decl,
LLVMValueRef out[4]);
void (*load_system_value)(struct si_shader_context *,
unsigned index,
const struct tgsi_full_declaration *decl);
void (*declare_memory_region)(struct si_shader_context *,
const struct tgsi_full_declaration *decl);
/** This array contains the input values for the shader. Typically these
* values will be in the form of a target intrinsic that will inform the
* backend how to load the actual inputs to the shader.
@ -325,6 +318,12 @@ LLVMValueRef si_load_image_desc(struct si_shader_context *ctx,
LLVMValueRef list, LLVMValueRef index,
enum ac_descriptor_type desc_type, bool dcc_off);
void si_load_system_value(struct si_shader_context *ctx,
unsigned index,
const struct tgsi_full_declaration *decl);
void si_declare_compute_memory(struct si_shader_context *ctx,
const struct tgsi_full_declaration *decl);
void si_llvm_load_input_vs(
struct si_shader_context *ctx,
unsigned input_index,

4
src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c
View file

@ -842,7 +842,7 @@ static void emit_declaration(struct lp_build_tgsi_context *bld_base,
{
unsigned idx;
for (idx = decl->Range.First; idx <= decl->Range.Last; idx++) {
ctx->load_system_value(ctx, idx, decl);
si_load_system_value(ctx, idx, decl);
}
}
break;
@ -870,7 +870,7 @@ static void emit_declaration(struct lp_build_tgsi_context *bld_base,
}
case TGSI_FILE_MEMORY:
ctx->declare_memory_region(ctx, decl);
si_declare_compute_memory(ctx, decl);
break;
default: