Module: Mesa Branch: main Commit: e7e0b90c949feeba51172c65682f1ee6fa85a31f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e7e0b90c949feeba51172c65682f1ee6fa85a31f
Author: Marek Olšák <[email protected]> Date: Sun Sep 26 15:21:34 2021 -0400 ac/llvm: rename ac_cull_triangle -> ac_cull_primitive Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13048> --- src/amd/llvm/ac_llvm_cull.c | 10 +++++----- src/amd/llvm/ac_llvm_cull.h | 10 +++++----- src/gallium/drivers/radeonsi/gfx10_shader_ngg.c | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/amd/llvm/ac_llvm_cull.c b/src/amd/llvm/ac_llvm_cull.c index 1bc6b6a1227..c9f4a9cfa9e 100644 --- a/src/amd/llvm/ac_llvm_cull.c +++ b/src/amd/llvm/ac_llvm_cull.c @@ -224,11 +224,11 @@ static void cull_bbox(struct ac_llvm_context *ctx, LLVMValueRef pos[3][4], * \param options See ac_cull_options. * \param accept_func Callback invoked in the inner-most branch where the primitive is accepted. */ -void ac_cull_triangle(struct ac_llvm_context *ctx, LLVMValueRef pos[3][4], - LLVMValueRef initially_accepted, LLVMValueRef vp_scale[2], - LLVMValueRef vp_translate[2], LLVMValueRef small_prim_precision, - struct ac_cull_options *options, ac_cull_accept_func accept_func, - void *userdata) +void ac_cull_primitive(struct ac_llvm_context *ctx, LLVMValueRef pos[3][4], + LLVMValueRef initially_accepted, LLVMValueRef vp_scale[2], + LLVMValueRef vp_translate[2], LLVMValueRef small_prim_precision, + struct ac_cull_options *options, ac_cull_accept_func accept_func, + void *userdata) { struct ac_position_w_info w; ac_analyze_position_w(ctx, pos, &w); diff --git a/src/amd/llvm/ac_llvm_cull.h b/src/amd/llvm/ac_llvm_cull.h index 676587d5b21..6aa52b2999d 100644 --- a/src/amd/llvm/ac_llvm_cull.h +++ b/src/amd/llvm/ac_llvm_cull.h @@ -52,10 +52,10 @@ struct ac_cull_options { typedef void (*ac_cull_accept_func)(struct ac_llvm_context *ctx, LLVMValueRef accepted, void *userdata); -void ac_cull_triangle(struct ac_llvm_context *ctx, LLVMValueRef pos[3][4], - LLVMValueRef initially_accepted, LLVMValueRef vp_scale[2], - LLVMValueRef vp_translate[2], LLVMValueRef small_prim_precision, - struct ac_cull_options *options, ac_cull_accept_func accept_func, - void *userdata); +void ac_cull_primitive(struct ac_llvm_context *ctx, LLVMValueRef pos[3][4], + LLVMValueRef initially_accepted, LLVMValueRef vp_scale[2], + LLVMValueRef vp_translate[2], LLVMValueRef small_prim_precision, + struct ac_cull_options *options, ac_cull_accept_func accept_func, + void *userdata); #endif diff --git a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c index 139639a71d0..15cbe314105 100644 --- a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c +++ b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c @@ -1006,9 +1006,9 @@ void gfx10_emit_ngg_culling_epilogue(struct ac_shader_abi *abi) gs_accepted, (void*)gs_vtxptr, }; - ac_cull_triangle(&ctx->ac, pos, ctx->ac.i1true, vp_scale, vp_translate, - small_prim_precision, &options, - gfx10_build_primitive_accepted, params); + ac_cull_primitive(&ctx->ac, pos, ctx->ac.i1true, vp_scale, vp_translate, + small_prim_precision, &options, + gfx10_build_primitive_accepted, params); } ac_build_endif(&ctx->ac, 16002); ac_build_s_barrier(&ctx->ac);
