fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-17 15:40:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv/rt: Force active leaves for every updateable accel struct

Browse source 
We can't rely on games getting updates right. To avoid adding
workarounds for tons of games, be more robust by default.

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28077>
This commit is contained in:
Friedrich Vock 2024-03-08 17:13:05 +01:00 • committed by Marge Bot
parent d12984edb8
commit 217072d25f
2 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/amd/vulkan/radv_acceleration_structure.c
View file

@ -93,6 +93,7 @@ enum internal_build_type {
struct build_config {
enum internal_build_type internal_type;
bool compact;
bool updateable;
};
struct acceleration_structure_layout {
@ -144,6 +145,10 @@ build_config(uint32_t leaf_count, const VkAccelerationStructureBuildGeometryInfo
build_info->type == VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR)
config.internal_type = INTERNAL_BUILD_TYPE_UPDATE;
if ((build_info->flags & VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_UPDATE_BIT_KHR) &&
build_info->type == VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR)
config.updateable = true;
if (build_info->flags & VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_COMPACTION_BIT_KHR)
config.compact = true;
@ -541,14 +546,16 @@ radv_device_init_accel_struct_build_state(struct radv_device *device)
if (device->meta_state.accel_struct_build.radix_sort)
goto exit;
if (device->instance->drirc.force_active_accel_struct_leaves)
result = create_build_pipeline_spv(device, leaf_always_active_spv, sizeof(leaf_always_active_spv),
sizeof(struct leaf_args), &device->meta_state.accel_struct_build.leaf_pipeline,
&device->meta_state.accel_struct_build.leaf_p_layout);
else
result = create_build_pipeline_spv(device, leaf_spv, sizeof(leaf_spv), sizeof(struct leaf_args),
&device->meta_state.accel_struct_build.leaf_pipeline,
&device->meta_state.accel_struct_build.leaf_p_layout);
result = create_build_pipeline_spv(device, leaf_always_active_spv, sizeof(leaf_always_active_spv),
sizeof(struct leaf_args),
&device->meta_state.accel_struct_build.leaf_updateable_pipeline,
&device->meta_state.accel_struct_build.leaf_p_layout);
if (result != VK_SUCCESS)
goto exit;
result = create_build_pipeline_spv(device, leaf_spv, sizeof(leaf_spv), sizeof(struct leaf_args),
&device->meta_state.accel_struct_build.leaf_pipeline,
&device->meta_state.accel_struct_build.leaf_p_layout);
if (result != VK_SUCCESS)
goto exit;
@ -647,6 +654,8 @@ struct radv_bvh_batch_state {
bool any_non_compact;
bool any_ploc;
bool any_lbvh;
bool any_updateable;
bool any_non_updateable;
bool any_update;
};
@ -719,18 +728,22 @@ static void
build_leaves(VkCommandBuffer commandBuffer, uint32_t infoCount,
const VkAccelerationStructureBuildGeometryInfoKHR *pInfos,
const VkAccelerationStructureBuildRangeInfoKHR *const *ppBuildRangeInfos, struct bvh_state *bvh_states,
enum radv_cmd_flush_bits flush_bits)
bool updateable)
{
RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
radv_write_user_event_marker(cmd_buffer, UserEventPush, "leaves");
cmd_buffer->device->vk.dispatch_table.CmdBindPipeline(
commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE, cmd_buffer->device->meta_state.accel_struct_build.leaf_pipeline);
commandBuffer, VK_PIPELINE_BIND_POINT_COMPUTE,
updateable ? cmd_buffer->device->meta_state.accel_struct_build.leaf_updateable_pipeline
: cmd_buffer->device->meta_state.accel_struct_build.leaf_pipeline);
for (uint32_t i = 0; i < infoCount; ++i) {
if (bvh_states[i].config.internal_type == INTERNAL_BUILD_TYPE_UPDATE)
continue;
if (bvh_states[i].config.updateable != updateable)
continue;
RADV_FROM_HANDLE(vk_acceleration_structure, accel_struct, pInfos[i].dstAccelerationStructure);
@ -759,8 +772,6 @@ build_leaves(VkCommandBuffer commandBuffer, uint32_t infoCount,
}
radv_write_user_event_marker(cmd_buffer, UserEventPop, NULL);
cmd_buffer->state.flush_bits |= flush_bits;
}
static void
@ -1382,6 +1393,11 @@ radv_CmdBuildAccelerationStructuresKHR(VkCommandBuffer commandBuffer, uint32_t i
else
batch_state.any_non_compact = true;
if (config.updateable)
batch_state.any_updateable = true;
else
batch_state.any_non_updateable = true;
if (config.internal_type == INTERNAL_BUILD_TYPE_PLOC) {
batch_state.any_ploc = true;
} else if (config.internal_type == INTERNAL_BUILD_TYPE_LBVH) {
@ -1431,7 +1447,12 @@ radv_CmdBuildAccelerationStructuresKHR(VkCommandBuffer commandBuffer, uint32_t i
cmd_buffer->state.current_event_type = EventInternalUnknown;
build_leaves(commandBuffer, infoCount, pInfos, ppBuildRangeInfos, bvh_states, flush_bits);
if (batch_state.any_non_updateable)
build_leaves(commandBuffer, infoCount, pInfos, ppBuildRangeInfos, bvh_states, false);
if (batch_state.any_updateable)
build_leaves(commandBuffer, infoCount, pInfos, ppBuildRangeInfos, bvh_states, true);
cmd_buffer->state.flush_bits |= flush_bits;
morton_generate(commandBuffer, infoCount, pInfos, bvh_states, flush_bits);

1
src/amd/vulkan/radv_private.h
View file

@ -702,6 +702,7 @@ struct radv_meta_state {
struct {
VkPipelineLayout leaf_p_layout;
VkPipeline leaf_pipeline;
VkPipeline leaf_updateable_pipeline;
VkPipelineLayout morton_p_layout;
VkPipeline morton_pipeline;
VkPipelineLayout lbvh_main_p_layout;