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

ac/radeonsi: add emit primitive to the abi

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Timothy Arceri 2018-01-19 09:09:29 +11:00
parent dd4591b794
commit 3bc5fa69f5
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4207,8 +4207,9 @@ visit_emit_vertex(struct ac_shader_abi *abi, unsigned stream, LLVMValueRef *addr
} }
static void static void
visit_end_primitive(struct nir_to_llvm_context *ctx, unsigned stream) visit_end_primitive(struct ac_shader_abi *abi, unsigned stream)
{ {
struct nir_to_llvm_context *ctx = nir_to_llvm_context_from_abi(abi);
ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_CUT | AC_SENDMSG_GS | (stream << 8), ctx->gs_wave_id); ac_build_sendmsg(&ctx->ac, AC_SENDMSG_GS_OP_CUT | AC_SENDMSG_GS | (stream << 8), ctx->gs_wave_id);
} }
@ -4457,7 +4458,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
ctx->abi->emit_vertex(ctx->abi, 0, ctx->outputs); ctx->abi->emit_vertex(ctx->abi, 0, ctx->outputs);
break; break;
case nir_intrinsic_end_primitive: case nir_intrinsic_end_primitive:
visit_end_primitive(ctx->nctx, nir_intrinsic_stream_id(instr)); ctx->abi->emit_primitive(ctx->abi, nir_intrinsic_stream_id(instr));
break; break;
case nir_intrinsic_load_tess_coord: { case nir_intrinsic_load_tess_coord: {
LLVMTypeRef type = ctx->nctx ? LLVMTypeRef type = ctx->nctx ?
@ -6819,6 +6820,7 @@ LLVMModuleRef ac_translate_nir_to_llvm(LLVMTargetMachineRef tm,
ctx.gs_next_vertex = ac_build_alloca(&ctx.ac, ctx.ac.i32, "gs_next_vertex"); ctx.gs_next_vertex = ac_build_alloca(&ctx.ac, ctx.ac.i32, "gs_next_vertex");
ctx.gs_max_out_vertices = shaders[i]->info.gs.vertices_out; ctx.gs_max_out_vertices = shaders[i]->info.gs.vertices_out;
ctx.abi.load_inputs = load_gs_input; ctx.abi.load_inputs = load_gs_input;
ctx.abi.emit_primitive = visit_end_primitive;
} else if (shaders[i]->info.stage == MESA_SHADER_TESS_CTRL) { } else if (shaders[i]->info.stage == MESA_SHADER_TESS_CTRL) {
ctx.tcs_outputs_read = shaders[i]->info.outputs_read; ctx.tcs_outputs_read = shaders[i]->info.outputs_read;
ctx.tcs_patch_outputs_read = shaders[i]->info.patch_outputs_read; ctx.tcs_patch_outputs_read = shaders[i]->info.patch_outputs_read;

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

@ -67,6 +67,9 @@ struct ac_shader_abi {
unsigned stream, unsigned stream,
LLVMValueRef *addrs); LLVMValueRef *addrs);
void (*emit_primitive)(struct ac_shader_abi *abi,
unsigned stream);
LLVMValueRef (*load_inputs)(struct ac_shader_abi *abi, LLVMValueRef (*load_inputs)(struct ac_shader_abi *abi,
unsigned location, unsigned location,
unsigned driver_location, unsigned driver_location,

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

@ -6030,6 +6030,7 @@ static bool si_compile_tgsi_main(struct si_shader_context *ctx,
bld_base->emit_fetch_funcs[TGSI_FILE_INPUT] = fetch_input_gs; bld_base->emit_fetch_funcs[TGSI_FILE_INPUT] = fetch_input_gs;
ctx->abi.load_inputs = si_nir_load_input_gs; ctx->abi.load_inputs = si_nir_load_input_gs;
ctx->abi.emit_vertex = si_llvm_emit_vertex; ctx->abi.emit_vertex = si_llvm_emit_vertex;
ctx->abi.emit_primitive = si_llvm_emit_primitive;
ctx->abi.emit_outputs = si_llvm_emit_gs_epilogue; ctx->abi.emit_outputs = si_llvm_emit_gs_epilogue;
bld_base->emit_epilogue = si_tgsi_emit_gs_epilogue; bld_base->emit_epilogue = si_tgsi_emit_gs_epilogue;
break; break;