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

radv: Handle nodes with 2 invalid children in internal node converter.

Browse source 
Fixes: 682dc5c28e ("radv: Add conversion shader for internal nodes")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19891>
(cherry picked from commit f531f671ef)
This commit is contained in:
Bas Nieuwenhuizen 2022-11-29 02:28:08 +01:00 • committed by Eric Engestrom
parent 68fc987c49
commit 2cabe4167f
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -5755,7 +5755,7 @@
"description": "radv: Handle nodes with 2 invalid children in internal node converter.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "682dc5c28e4e16ef66cbe996d908d0d5b5c77051"
},

12
src/amd/vulkan/bvh/converter_internal.comp
View file

@ -108,10 +108,10 @@ main()
children[found_child_count++] = src.children[i];
while (found_child_count < 4) {
uint32_t collapsed_child_index;
float largest_surface_area = 0.0f;
int32_t collapsed_child_index = -1;
float largest_surface_area = -INFINITY;
for (uint32_t i = 0; i < found_child_count; ++i) {
for (int32_t i = 0; i < found_child_count; ++i) {
if (ir_id_to_type(children[i]) != radv_ir_node_internal)
continue;
@ -126,7 +126,7 @@ main()
}
}
if (largest_surface_area > 0.0f) {
if (collapsed_child_index != -1) {
REF(radv_ir_box_node) child_node =
REF(radv_ir_box_node)OFFSET(args.intermediate_bvh,
ir_id_to_offset(children[collapsed_child_index]));
@ -146,6 +146,10 @@ main()
if (valid_grandchild_count > 0)
children[collapsed_child_index] = grandchildren[0];
else {
found_child_count--;
children[collapsed_child_index] = children[found_child_count];
}
if (in_final_tree == FINAL_TREE_PRESENT)
DEREF(child_node).in_final_tree = FINAL_TREE_NOT_PRESENT;