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

radv/rra: Set the metadata size correctly

Browse source 
Fixes: 5749806 ("radv: Add Radeon Raytracing Analyzer trace dumping utilities")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20047>
(cherry picked from commit bb6b45e26e)
This commit is contained in:
Konstantin Seurer 2022-11-29 19:12:40 +01:00 • committed by Eric Engestrom
parent dcf2960733
commit d988e3f32b
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4252,7 +4252,7 @@
"description": "radv/rra: Set the metadata size correctly",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "574980675405e36d34519cb5cbd315b3582850ec"
},

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

@ -258,8 +258,8 @@ static_assert(sizeof(struct rra_geometry_info) == 12, "rra_geometry_info does no
static struct rra_accel_struct_header
rra_fill_accel_struct_header_common(struct radv_accel_struct_header *header,
size_t leaf_node_data_size, size_t internal_node_data_size,
uint64_t primitive_count)
size_t parent_id_table_size, size_t leaf_node_data_size,
size_t internal_node_data_size, uint64_t primitive_count)
{
return (struct rra_accel_struct_header){
.post_build_info =
@ -268,8 +268,8 @@ rra_fill_accel_struct_header_common(struct radv_accel_struct_header *header,
/* Seems to be no compression */
.tri_compression_mode = 0,
},
.metadata_size = sizeof(struct rra_accel_struct_metadata),
.file_size = sizeof(struct rra_accel_struct_metadata) +
.metadata_size = sizeof(struct rra_accel_struct_metadata) + parent_id_table_size,
.file_size = sizeof(struct rra_accel_struct_metadata) + parent_id_table_size +
sizeof(struct rra_accel_struct_header) + internal_node_data_size +
leaf_node_data_size,
.primitive_count = primitive_count,
@ -346,11 +346,12 @@ struct rra_triangle_node {
static_assert(sizeof(struct rra_triangle_node) == 64, "rra_triangle_node does not match RRA spec!");
static void
rra_dump_tlas_header(struct radv_accel_struct_header *header, size_t leaf_node_data_size,
size_t internal_node_data_size, uint64_t primitive_count, FILE *output)
rra_dump_tlas_header(struct radv_accel_struct_header *header, size_t parent_id_table_size,
size_t leaf_node_data_size, size_t internal_node_data_size,
uint64_t primitive_count, FILE *output)
{
struct rra_accel_struct_header file_header = rra_fill_accel_struct_header_common(
header, leaf_node_data_size, internal_node_data_size, primitive_count);
header, parent_id_table_size, leaf_node_data_size, internal_node_data_size, primitive_count);
file_header.post_build_info.bvh_type = RRA_BVH_TYPE_TLAS;
file_header.geometry_type = VK_GEOMETRY_TYPE_INSTANCES_KHR;
@ -358,13 +359,13 @@ rra_dump_tlas_header(struct radv_accel_struct_header *header, size_t leaf_node_d
}
static void
rra_dump_blas_header(struct radv_accel_struct_header *header,
rra_dump_blas_header(struct radv_accel_struct_header *header, size_t parent_id_table_size,
struct radv_accel_struct_geometry_info *geometry_infos,
size_t leaf_node_data_size, size_t internal_node_data_size,
uint64_t primitive_count, FILE *output)
{
struct rra_accel_struct_header file_header = rra_fill_accel_struct_header_common(
header, leaf_node_data_size, internal_node_data_size, primitive_count);
header, parent_id_table_size, leaf_node_data_size, internal_node_data_size, primitive_count);
file_header.post_build_info.bvh_type = RRA_BVH_TYPE_BLAS;
file_header.geometry_type =
header->geometry_count ? geometry_infos->type : VK_GEOMETRY_TYPE_TRIANGLES_KHR;
@ -823,10 +824,10 @@ rra_dump_acceleration_structure(struct rra_copied_accel_struct *copied_struct,
fwrite(node_parent_table, 1, node_parent_table_size, output);
if (is_tlas)
rra_dump_tlas_header(header, bvh_info.leaf_nodes_size, bvh_info.internal_nodes_size,
primitive_count, output);
rra_dump_tlas_header(header, node_parent_table_size, bvh_info.leaf_nodes_size,
bvh_info.internal_nodes_size, primitive_count, output);
else
rra_dump_blas_header(header, geometry_infos, bvh_info.leaf_nodes_size,
rra_dump_blas_header(header, node_parent_table_size, geometry_infos, bvh_info.leaf_nodes_size,
bvh_info.internal_nodes_size, primitive_count, output);
/* Write acceleration structure data */