KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ac/llvm: call the callback in all return paths of ac_cull_triangle 

Fixes: 12d2df15f1 ("ac/llvm: add a callback to ac_cull_triangle to generate code in inner-most block")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4959
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11625>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2021-06-21 15:04:19 +02:00
parent 017d6cc642
commit b564ec7769
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/amd/llvm/ac_llvm_cull.c
View File

@ -125,8 +125,11 @@ static LLVMValueRef cull_bbox(struct ac_llvm_context *ctx, LLVMValueRef pos[3][4
{
LLVMBuilderRef builder = ctx->builder;
if (!cull_view_xy && !cull_view_near_z && !cull_view_far_z && !cull_small_prims)
if (!cull_view_xy && !cull_view_near_z && !cull_view_far_z && !cull_small_prims) {
if (accept_func)
accept_func(ctx, initially_accepted, userdata);
return initially_accepted;
}
/* Skip the culling if the primitive has already been rejected or
* if any W is negative. The bounding box culling doesn't work when
@ -206,6 +209,11 @@ static LLVMValueRef cull_bbox(struct ac_llvm_context *ctx, LLVMValueRef pos[3][4
LLVMBuildStore(builder, accepted, accepted_var);
}
if (accept_func) {
/* If the caller provided a accept_func, call it in the else branch */
ac_build_else(ctx, 10000000);
accept_func(ctx, initially_accepted, userdata);
}
ac_build_endif(ctx, 10000000);
return LLVMBuildLoad(builder, accepted_var, "");