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

vulkan: Add acceleration structure update keys

Browse Source 
The driver can use an optimized shader when src == dst.

Reviewed-by: Natalie Vock <natalie.vock@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34601>
This commit is contained in:
Konstantin Seurer
2025-04-06 12:44:56 +02:00
parent 0796d8c502
commit e1110d20f8
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_acceleration_structure.c
+2 -2
View File
@@ -683,7 +683,7 @@ radv_init_update_scratch(VkCommandBuffer commandBuffer, VkDeviceAddress scratch,
}
static void
radv_update_bind_pipeline(VkCommandBuffer commandBuffer)
radv_update_bind_pipeline(VkCommandBuffer commandBuffer, uint32_t key)
{
VK_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
@@ -717,7 +717,7 @@ pack_geometry_id_and_flags(uint32_t geometry_id, uint32_t flags)
static void
radv_update_as(VkCommandBuffer commandBuffer, const VkAccelerationStructureBuildGeometryInfoKHR *build_info,
const VkAccelerationStructureBuildRangeInfoKHR *build_range_infos, uint32_t leaf_count,
const VkAccelerationStructureBuildRangeInfoKHR *build_range_infos, uint32_t leaf_count, uint32_t key,
struct vk_acceleration_structure *src, struct vk_acceleration_structure *dst)
{
VK_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
src/vulkan/runtime/vk_acceleration_structure.c
+12 -6
View File
@@ -122,6 +122,7 @@ struct build_config {
enum internal_build_type internal_type;
bool updateable;
uint32_t encode_key[MAX_ENCODE_PASSES];
uint32_t update_key[MAX_ENCODE_PASSES];
};
struct scratch_layout {
@@ -169,10 +170,11 @@ build_config(struct vk_device *device, uint32_t leaf_count,
ops->update_as[0])
config.updateable = true;
for (unsigned i = 0; i < ARRAY_SIZE(config.encode_key); i++) {
if (!ops->get_encode_key[i])
break;
config.encode_key[i] = ops->get_encode_key[i](device, leaf_count, build_info->flags);
for (unsigned i = 0; i < MAX_ENCODE_PASSES; i++) {
if (ops->get_encode_key[i])
config.encode_key[i] = ops->get_encode_key[i](device, leaf_count, build_info->flags);
if (ops->get_update_key[i])
config.update_key[i] = ops->get_update_key[i](device, build_info->srcAccelerationStructure == build_info->dstAccelerationStructure);
}
return config;
@@ -1224,6 +1226,7 @@ vk_cmd_build_acceleration_structures(VkCommandBuffer commandBuffer,
bool update;
uint32_t encode_key = 0;
uint32_t update_key = 0;
for (uint32_t i = 0; i < infoCount; ++i) {
if (bvh_states[i].last_encode_pass == pass + 1)
continue;
@@ -1236,15 +1239,17 @@ vk_cmd_build_acceleration_structures(VkCommandBuffer commandBuffer,
if (!update && !ops->encode_as[pass])
continue;
encode_key = bvh_states[i].config.encode_key[pass];
update_key = bvh_states[i].config.update_key[pass];
progress = true;
if (update)
ops->update_bind_pipeline[pass](commandBuffer);
ops->update_bind_pipeline[pass](commandBuffer, update_key);
else
ops->encode_bind_pipeline[pass](commandBuffer, encode_key);
} else {
if (update != (bvh_states[i].config.internal_type ==
INTERNAL_BUILD_TYPE_UPDATE) ||
encode_key != bvh_states[i].config.encode_key[pass])
encode_key != bvh_states[i].config.encode_key[pass] ||
update_key != bvh_states[i].config.update_key[pass])
continue;
}
@@ -1256,6 +1261,7 @@ vk_cmd_build_acceleration_structures(VkCommandBuffer commandBuffer,
&pInfos[i],
ppBuildRangeInfos[i],
bvh_states[i].leaf_node_count,
update_key,
src,
accel_struct);
src/vulkan/runtime/vk_acceleration_structure.h
+3 -1
View File
@@ -80,6 +80,7 @@ struct vk_acceleration_structure_build_ops {
uint32_t (*get_encode_key[MAX_ENCODE_PASSES])(struct vk_device *device,
VkAccelerationStructureTypeKHR type,
VkBuildAccelerationStructureFlagBitsKHR flags);
uint32_t (*get_update_key[MAX_ENCODE_PASSES])(struct vk_device *device, bool in_place);
VkResult (*encode_bind_pipeline[MAX_ENCODE_PASSES])(VkCommandBuffer cmd_buffer,
uint32_t key);
void (*encode_as[MAX_ENCODE_PASSES])(VkCommandBuffer cmd_buffer,
@@ -95,11 +96,12 @@ struct vk_acceleration_structure_build_ops {
uint32_t leaf_count,
struct vk_acceleration_structure *src_as,
struct vk_acceleration_structure *dst_as);
void (*update_bind_pipeline[MAX_ENCODE_PASSES])(VkCommandBuffer cmd_buffer);
void (*update_bind_pipeline[MAX_ENCODE_PASSES])(VkCommandBuffer cmd_buffer, uint32_t key);
void (*update_as[MAX_ENCODE_PASSES])(VkCommandBuffer cmd_buffer,
const VkAccelerationStructureBuildGeometryInfoKHR *build_info,
const VkAccelerationStructureBuildRangeInfoKHR *build_range_infos,
uint32_t leaf_count,
uint32_t key,
struct vk_acceleration_structure *src,
struct vk_acceleration_structure *dst);