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

ac/nir: refactor input variable iteration.

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Bas Nieuwenhuizen 2017-08-15 16:31:20 +02:00
parent 4ffa9f3635
commit a7f5545ede
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5003,26 +5003,19 @@ handle_fs_input_decl(struct nir_to_llvm_context *ctx,
} }
static void static void
handle_shader_input_decl(struct nir_to_llvm_context *ctx, handle_vs_inputs(struct nir_to_llvm_context *ctx,
struct nir_variable *variable) struct nir_shader *nir) {
{ nir_foreach_variable(variable, &nir->inputs)
switch (ctx->stage) {
case MESA_SHADER_VERTEX:
handle_vs_input_decl(ctx, variable); handle_vs_input_decl(ctx, variable);
break;
case MESA_SHADER_FRAGMENT:
handle_fs_input_decl(ctx, variable);
break;
default:
break;
}
} }
static void static void
handle_fs_inputs_pre(struct nir_to_llvm_context *ctx, handle_fs_inputs(struct nir_to_llvm_context *ctx,
struct nir_shader *nir) struct nir_shader *nir)
{ {
nir_foreach_variable(variable, &nir->inputs)
handle_fs_input_decl(ctx, variable);
unsigned index = 0; unsigned index = 0;
for (unsigned i = 0; i < RADEON_LLVM_MAX_INPUTS; ++i) { for (unsigned i = 0; i < RADEON_LLVM_MAX_INPUTS; ++i) {
LLVMValueRef interp_param; LLVMValueRef interp_param;
@ -6311,11 +6304,10 @@ LLVMModuleRef ac_translate_nir_to_llvm(LLVMTargetMachineRef tm,
ctx.num_output_clips = nir->info.clip_distance_array_size; ctx.num_output_clips = nir->info.clip_distance_array_size;
ctx.num_output_culls = nir->info.cull_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) if (nir->stage == MESA_SHADER_FRAGMENT)
handle_fs_inputs_pre(&ctx, nir); handle_fs_inputs(&ctx, nir);
else if(nir->stage == MESA_SHADER_VERTEX)
handle_vs_inputs(&ctx, nir);
ctx.abi.chip_class = options->chip_class; ctx.abi.chip_class = options->chip_class;
ctx.abi.inputs = &ctx.inputs[0]; ctx.abi.inputs = &ctx.inputs[0];