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

radv/bvh: Add a define for extended SAH

Browse source 
This will be used to only chose depth aware SAH when we know that it's
more optimal and doesn't increase build overhead too much.

Reviewed-by: Friedrich Vock <friedrich.vock@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20656>
This commit is contained in:
Konstantin Seurer 2023-01-11 21:28:52 +01:00 • committed by Marge Bot
parent 13a8a4071a
commit b1755c0b21
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/vulkan/bvh/meson.build
View file

@ -48,7 +48,7 @@ bvh_shaders = [
[
'ploc_internal.comp',
'ploc_internal',
[],
['EXTENDED_SAH=0'],
],
[
'converter_internal.comp',

10
src/amd/vulkan/bvh/ploc_internal.comp
View file

@ -134,7 +134,9 @@ push_node(uint32_t children[2])
}
DEREF(dst_node).base.aabb = total_bounds;
#if EXTENDED_SAH
DEREF(dst_node).base.cost = cost * 0.5 + BVH_LEVEL_COST;
#endif
DEREF(dst_node).in_final_tree = FINAL_TREE_UNKNOWN;
return dst_id;
}
@ -160,7 +162,9 @@ decode_neighbour_offset(uint32_t encoded_offset)
#define NUM_PLOC_LDS_ITEMS PLOC_WORKGROUP_SIZE + 4 * PLOC_NEIGHBOURHOOD
shared radv_aabb shared_bounds[NUM_PLOC_LDS_ITEMS];
#if EXTENDED_SAH
shared float shared_costs[NUM_PLOC_LDS_ITEMS];
#endif
shared uint32_t nearest_neighbour_indices[NUM_PLOC_LDS_ITEMS];
uint32_t
@ -186,7 +190,9 @@ load_bounds(VOID_REF ids, uint32_t iter, uint32_t task_index, uint32_t lds_base,
REF(radv_ir_node) node = REF(radv_ir_node)(addr);
shared_bounds[i - lds_base] = DEREF(node).aabb;
#if EXTENDED_SAH
shared_costs[i - lds_base] = DEREF(node).cost;
#endif
}
}
@ -198,6 +204,7 @@ combined_node_cost(uint32_t lds_base, uint32_t i, uint32_t j)
combined_bounds.max = max(shared_bounds[i - lds_base].max, shared_bounds[j - lds_base].max);
float area = aabb_surface_area(combined_bounds);
#if EXTENDED_SAH
if (area == 0.0)
return 0.0;
@ -220,6 +227,9 @@ combined_node_cost(uint32_t lds_base, uint32_t i, uint32_t j)
(1.0 + shared_costs[i - lds_base] * p_i) * (1.0 + shared_costs[j - lds_base] * p_j);
return area / combined_cost;
#else
return area;
#endif
}
shared uint32_t shared_aggregate_sum;