OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Do an early check of distance in triangle culling.

Browse Source 
Culls like 99% of the triangles that are culled at all.

Reduces VALU usage in Q2RTX traversal by ~8%, though doesn't look
like VALU is a bottleneck at this point ...

For Control we get a ~5% reduction in VALU usage, but similarly it
doesn't look like a bottleneck.

Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18830>
This commit is contained in:
Bas Nieuwenhuizen
2022-09-27 01:47:20 +02:00
committed by Marge Bot
parent e06c332bf7
commit 1dd5d94f65
1 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/amd/vulkan/radv_rt_common.c
View File

@@ -431,56 +431,61 @@ insert_traversal_triangle_case(struct radv_device *device, nir_builder *b,
intersection.t = nir_channel(b, result, 0); intersection.t = nir_channel(b, result, 0);
nir_ssa_def *div = nir_channel(b, result, 1); nir_ssa_def *div = nir_channel(b, result, 1);
intersection.t = nir_fdiv(b, intersection.t, div); intersection.t = nir_fdiv(b, intersection.t, div);
intersection.frontface = nir_flt(b, nir_imm_float(b, 0), div);
nir_ssa_def *switch_ccw = nir_test_mask(b, nir_load_deref(b, args->vars.sbt_offset_and_flags),
VK_GEOMETRY_INSTANCE_TRIANGLE_FLIP_FACING_BIT_KHR << 24);
intersection.frontface = nir_ixor(b, intersection.frontface, switch_ccw);
nir_ssa_def *not_cull = nir_push_if(b, nir_flt(b, intersection.t, nir_load_deref(b, args->vars.tmax)));
nir_inot(b, nir_test_mask(b, args->flags, SpvRayFlagsSkipTrianglesKHRMask));
nir_ssa_def *not_facing_cull =
nir_ieq_imm(b,
nir_iand(b, args->flags,
nir_bcsel(b, intersection.frontface,
nir_imm_int(b, SpvRayFlagsCullFrontFacingTrianglesKHRMask),
nir_imm_int(b, SpvRayFlagsCullBackFacingTrianglesKHRMask))),
0);
not_cull = nir_iand(
b, not_cull,
nir_ior(b, not_facing_cull,
nir_test_mask(b, nir_load_deref(b, args->vars.sbt_offset_and_flags),
VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR << 24)));
nir_push_if(b,
nir_iand(b,
nir_iand(b, nir_flt(b, intersection.t, nir_load_deref(b, args->vars.tmax)),
nir_flt(b, args->tmin, intersection.t)),
not_cull));
{ {
intersection.base.node_addr = build_node_to_addr(device, b, bvh_node); intersection.frontface = nir_flt(b, nir_imm_float(b, 0), div);
nir_ssa_def *triangle_info = nir_ssa_def *switch_ccw =
nir_build_load_global(b, 2, 32, nir_test_mask(b, nir_load_deref(b, args->vars.sbt_offset_and_flags),
nir_iadd_imm(b, intersection.base.node_addr, VK_GEOMETRY_INSTANCE_TRIANGLE_FLIP_FACING_BIT_KHR << 24);
offsetof(struct radv_bvh_triangle_node, triangle_id))); intersection.frontface = nir_ixor(b, intersection.frontface, switch_ccw);
intersection.base.primitive_id = nir_channel(b, triangle_info, 0);
intersection.base.geometry_id_and_flags = nir_channel(b, triangle_info, 1);
intersection.base.opaque =
hit_is_opaque(b, nir_load_deref(b, args->vars.sbt_offset_and_flags), args->flags,
intersection.base.geometry_id_and_flags);
not_cull = nir_ieq_imm(b, nir_ssa_def *not_cull =
nir_iand(b, args->flags, nir_inot(b, nir_test_mask(b, args->flags, SpvRayFlagsSkipTrianglesKHRMask));
nir_bcsel(b, intersection.base.opaque, nir_ssa_def *not_facing_cull =
nir_imm_int(b, SpvRayFlagsCullOpaqueKHRMask), nir_ieq_imm(b,
nir_imm_int(b, SpvRayFlagsCullNoOpaqueKHRMask))), nir_iand(b, args->flags,
0); nir_bcsel(b, intersection.frontface,
nir_push_if(b, not_cull); nir_imm_int(b, SpvRayFlagsCullFrontFacingTrianglesKHRMask),
nir_imm_int(b, SpvRayFlagsCullBackFacingTrianglesKHRMask))),
0);
not_cull = nir_iand(
b, not_cull,
nir_ior(b, not_facing_cull,
nir_test_mask(b, nir_load_deref(b, args->vars.sbt_offset_and_flags),
VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR << 24)));
nir_push_if(b, nir_iand(b,
nir_flt(b, args->tmin, intersection.t), not_cull));
{ {
nir_ssa_def *divs[2] = {div, div}; intersection.base.node_addr = build_node_to_addr(device, b, bvh_node);
intersection.barycentrics = nir_fdiv(b, nir_channels(b, result, 0xc), nir_vec(b, divs, 2)); nir_ssa_def *triangle_info = nir_build_load_global(
b, 2, 32,
nir_iadd_imm(b, intersection.base.node_addr,
offsetof(struct radv_bvh_triangle_node, triangle_id)));
intersection.base.primitive_id = nir_channel(b, triangle_info, 0);
intersection.base.geometry_id_and_flags = nir_channel(b, triangle_info, 1);
intersection.base.opaque =
hit_is_opaque(b, nir_load_deref(b, args->vars.sbt_offset_and_flags), args->flags,
intersection.base.geometry_id_and_flags);
args->triangle_cb(b, &intersection, args); not_cull = nir_ieq_imm(b,
nir_iand(b, args->flags,
nir_bcsel(b, intersection.base.opaque,
nir_imm_int(b, SpvRayFlagsCullOpaqueKHRMask),
nir_imm_int(b, SpvRayFlagsCullNoOpaqueKHRMask))),
0);
nir_push_if(b, not_cull);
{
nir_ssa_def *divs[2] = {div, div};
intersection.barycentrics =
nir_fdiv(b, nir_channels(b, result, 0xc), nir_vec(b, divs, 2));
args->triangle_cb(b, &intersection, args);
}
nir_pop_if(b, NULL);
} }
nir_pop_if(b, NULL); nir_pop_if(b, NULL);
} }