griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Sculpt: Simplify scratch array usage for BVH build

Browse Source
This commit is contained in:
Hans Goudey
2024-07-23 22:33:10 -04:00
parent d40751c7b2
commit 0da90f05fe
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenkernel/intern/pbvh.cc
View File

@@ -109,7 +109,7 @@ static bool face_materials_match(const Span<int> material_indices,
/* Adapted from BLI_kdopbvh.c */
/* Returns the index of the first element on the right of the partition */
static int partition_prim_indices(MutableSpan<int> prim_indices,
int *prim_scratch,
MutableSpan<int> prim_scratch,
int lo,
int hi,
int axis,
@@ -417,7 +417,7 @@ static void build_sub(Tree &pbvh,
const Span<Bounds<float3>> prim_bounds,
int offset,
int count,
int *prim_scratch,
MutableSpan<int> prim_scratch,
int depth)
{
const Span<int> prim_to_face_map = pbvh.type() == Type::Mesh ?
@@ -425,11 +425,6 @@ static void build_sub(Tree &pbvh,
pbvh.subdiv_ccg_->grid_to_face_map;
int end;
if (!prim_scratch) {
prim_scratch = static_cast<int *>(
MEM_malloc_arrayN(pbvh.prim_indices_.size(), sizeof(int), __func__));
}
/* Decide whether this is a leaf or not */
const bool below_leaf_limit = count <= leaf_limit || depth >= STACK_FIXED_DEPTH - 1;
if (below_leaf_limit) {
@@ -447,10 +442,6 @@ static void build_sub(Tree &pbvh,
offset,
count);
if (node_index == 0) {
MEM_SAFE_FREE(prim_scratch);
}
return;
}
}
@@ -529,10 +520,6 @@ static void build_sub(Tree &pbvh,
offset + count - end,
prim_scratch,
depth + 1);
if (node_index == 0) {
MEM_SAFE_FREE(prim_scratch);
}
}
static void pbvh_build(Tree &pbvh,
@@ -569,7 +556,7 @@ static void pbvh_build(Tree &pbvh,
prim_bounds,
0,
totprim,
nullptr,
Array<int>(pbvh.prim_indices_.size()),
0);
}