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

radv/rra: Refactor resource management during dumping

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20184>
This commit is contained in:
Konstantin Seurer
2022-12-06 17:08:46 +01:00
committed by Marge Bot
parent ab8777b384
commit 446c49cdf7
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/amd/vulkan/radv_rra.c
View File

@@ -732,6 +732,12 @@ rra_dump_acceleration_structure(struct radv_rra_accel_struct_data *accel_struct,
} }
} }
VkResult result = VK_SUCCESS;
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}; struct rra_bvh_info bvh_info = {0};
rra_gather_bvh_info(data + header->bvh_offset, RADV_BVH_ROOT_NODE, &bvh_info); rra_gather_bvh_info(data + header->bvh_offset, RADV_BVH_ROOT_NODE, &bvh_info);
@@ -746,22 +752,22 @@ rra_dump_acceleration_structure(struct radv_rra_accel_struct_data *accel_struct,
uint32_t node_parent_table_size = uint32_t node_parent_table_size =
((bvh_info.leaf_nodes_size + bvh_info.internal_nodes_size) / 64) * sizeof(uint32_t); ((bvh_info.leaf_nodes_size + bvh_info.internal_nodes_size) / 64) * sizeof(uint32_t);
uint32_t *node_parent_table = calloc(node_parent_table_size, 1); node_parent_table = calloc(node_parent_table_size, 1);
if (!node_parent_table) { if (!node_parent_table) {
return VK_ERROR_OUT_OF_HOST_MEMORY; result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto exit;
} }
uint32_t *leaf_node_ids = calloc(primitive_count, sizeof(uint32_t)); leaf_node_ids = calloc(primitive_count, sizeof(uint32_t));
if (!leaf_node_ids) { if (!leaf_node_ids) {
free(node_parent_table); result = VK_ERROR_OUT_OF_HOST_MEMORY;
return VK_ERROR_OUT_OF_HOST_MEMORY; goto exit;
} }
uint8_t *dst_structure_data = dst_structure_data =
calloc(RRA_ROOT_NODE_OFFSET + bvh_info.internal_nodes_size + bvh_info.leaf_nodes_size, 1); calloc(RRA_ROOT_NODE_OFFSET + bvh_info.internal_nodes_size + bvh_info.leaf_nodes_size, 1);
if (!dst_structure_data) { if (!dst_structure_data) {
free(node_parent_table); result = VK_ERROR_OUT_OF_HOST_MEMORY;
free(leaf_node_ids); goto exit;
return VK_ERROR_OUT_OF_HOST_MEMORY;
} }
struct rra_transcoding_context ctx = { struct rra_transcoding_context ctx = {
@@ -832,11 +838,12 @@ rra_dump_acceleration_structure(struct radv_rra_accel_struct_data *accel_struct,
uint32_t leaf_node_list_size = primitive_count * sizeof(uint32_t); uint32_t leaf_node_list_size = primitive_count * sizeof(uint32_t);
fwrite(leaf_node_ids, 1, leaf_node_list_size, output); fwrite(leaf_node_ids, 1, leaf_node_list_size, output);
exit:
free(dst_structure_data); free(dst_structure_data);
free(node_parent_table); free(node_parent_table);
free(leaf_node_ids); free(leaf_node_ids);
return VK_SUCCESS; return result;
} }
int int