fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv/rra: Fix leaf node id order

Browse source 
Leaf nodes aren't stored in build order so we have to account for that
when dumping leaf node ids.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20184>
This commit is contained in:
Konstantin Seurer 2022-12-06 17:26:36 +01:00 • committed by Marge Bot
parent 3a8c3b813e
commit ffc8d490b7
1 changed files with 50 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/amd/vulkan/radv_rra.c
View file

@ -385,22 +385,6 @@ rra_dump_blas_header(struct radv_accel_struct_header *header, size_t parent_id_t
fwrite(&file_header, sizeof(struct rra_accel_struct_header), 1, output);
}
static void
rra_dump_blas_geometry_infos(struct radv_accel_struct_geometry_info *geometry_infos,
uint32_t geometry_count, FILE *output)
{
uint32_t accumulated_primitive_count = 0;
for (uint32_t i = 0; i < geometry_count; ++i) {
accumulated_primitive_count += geometry_infos[i].primitive_count;
struct rra_geometry_info geometry_info = {
.primitive_count = geometry_infos[i].primitive_count,
.flags = geometry_infos[i].flags,
.leaf_node_list_offset = accumulated_primitive_count * sizeof(uint32_t),
};
fwrite(&geometry_info, sizeof(struct rra_geometry_info), 1, output);
}
}
static uint32_t
rra_parent_table_index_from_offset(uint32_t offset, uint32_t parent_table_size)
{
@ -534,7 +518,7 @@ struct rra_transcoding_context {
uint32_t *parent_id_table;
uint32_t parent_id_table_size;
uint32_t *leaf_node_ids;
uint32_t leaf_index;
uint32_t *leaf_indices;
};
static void
@ -635,6 +619,22 @@ rra_transcode_box32_node(struct rra_transcoding_context *ctx, const struct radv_
}
}
static uint32_t
get_geometry_id(const void *node, uint32_t node_type)
{
if (node_type == radv_bvh_node_triangle) {
const struct radv_bvh_triangle_node *triangle = node;
return triangle->geometry_id_and_flags & 0xFFFFFFF;
}
if (node_type == radv_bvh_node_aabb) {
const struct radv_bvh_aabb_node *aabb = node;
return aabb->geometry_id_and_flags & 0xFFFFFFF;
}
return 0;
}
static uint32_t
rra_transcode_node(struct rra_transcoding_context *ctx, uint32_t parent_id, uint32_t src_id)
{
@ -667,7 +667,7 @@ rra_transcode_node(struct rra_transcoding_context *ctx, uint32_t parent_id, uint
uint32_t dst_id = node_type | (dst_offset >> 3);
if (!is_internal_node(node_type))
ctx->leaf_node_ids[ctx->leaf_index++] = dst_id;
ctx->leaf_node_ids[ctx->leaf_indices[get_geometry_id(src_child_node, node_type)]++] = dst_id;
return dst_id;
}
@ -675,6 +675,7 @@ rra_transcode_node(struct rra_transcoding_context *ctx, uint32_t parent_id, uint
struct rra_bvh_info {
uint32_t leaf_nodes_size;
uint32_t internal_nodes_size;
struct rra_geometry_info *geometry_infos;
};
static void
@ -702,13 +703,15 @@ rra_gather_bvh_info(const uint8_t *bvh, uint32_t node_id, struct rra_bvh_info *d
break;
}
const void *node = bvh + ((node_id & (~7u)) << 3);
if (is_internal_node(node_type)) {
uint32_t node_offset = (node_id & (~7u)) << 3;
/* The child ids are located at offset=0 for both box16 and box32 nodes. */
const uint32_t *children = (const uint32_t *)(bvh + node_offset);
const uint32_t *children = node;
for (uint32_t i = 0; i < 4; i++)
if (children[i] != 0xffffffff)
rra_gather_bvh_info(bvh, children[i], dst);
} else {
dst->geometry_infos[get_geometry_id(node, node_type)].primitive_count++;
}
}
@ -741,20 +744,40 @@ rra_dump_acceleration_structure(struct radv_rra_accel_struct_data *accel_struct,
VkResult result = VK_SUCCESS;
struct rra_geometry_info *rra_geometry_infos = NULL;
uint32_t *leaf_indices = NULL;
uint32_t *node_parent_table = NULL;
uint32_t *leaf_node_ids = NULL;
uint8_t *dst_structure_data = NULL;
struct rra_bvh_info bvh_info = {0};
rra_geometry_infos = calloc(header->geometry_count, sizeof(struct rra_geometry_info));
if (!rra_geometry_infos) {
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto exit;
}
struct rra_bvh_info bvh_info = {
.geometry_infos = rra_geometry_infos,
};
rra_gather_bvh_info(data + header->bvh_offset, RADV_BVH_ROOT_NODE, &bvh_info);
leaf_indices = calloc(header->geometry_count, sizeof(struct rra_geometry_info));
if (!leaf_indices) {
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto exit;
}
uint64_t primitive_count = 0;
struct radv_accel_struct_geometry_info *geometry_infos =
(struct radv_accel_struct_geometry_info *)(data + geometry_infos_offset);
for (uint32_t i = 0; i < header->geometry_count; ++i)
primitive_count += geometry_infos[i].primitive_count;
for (uint32_t i = 0; i < header->geometry_count; ++i) {
rra_geometry_infos[i].flags = geometry_infos[i].flags;
rra_geometry_infos[i].leaf_node_list_offset = primitive_count * sizeof(uint32_t);
leaf_indices[i] = primitive_count;
primitive_count += rra_geometry_infos[i].primitive_count;
}
uint32_t node_parent_table_size =
((bvh_info.leaf_nodes_size + bvh_info.internal_nodes_size) / 64) * sizeof(uint32_t);
@ -785,7 +808,7 @@ rra_dump_acceleration_structure(struct radv_rra_accel_struct_data *accel_struct,
.parent_id_table = node_parent_table,
.parent_id_table_size = node_parent_table_size,
.leaf_node_ids = leaf_node_ids,
.leaf_index = 0,
.leaf_indices = leaf_indices,
};
rra_transcode_node(&ctx, 0xFFFFFFFF, RADV_BVH_ROOT_NODE);
@ -839,13 +862,15 @@ rra_dump_acceleration_structure(struct radv_rra_accel_struct_data *accel_struct,
bvh_info.internal_nodes_size + bvh_info.leaf_nodes_size, output);
if (!is_tlas)
rra_dump_blas_geometry_infos(geometry_infos, header->geometry_count, output);
fwrite(rra_geometry_infos, sizeof(struct rra_geometry_info), header->geometry_count, output);
/* Write leaf node ids */
uint32_t leaf_node_list_size = primitive_count * sizeof(uint32_t);
fwrite(leaf_node_ids, 1, leaf_node_list_size, output);
exit:
free(rra_geometry_infos);
free(leaf_indices);
free(dst_structure_data);
free(node_parent_table);
free(leaf_node_ids);