archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Another tree pass during build to increase the number of nodes that have multipe of 4childs

Browse Source
This commit is contained in:
Andre Susano Pinto
2009-08-13 15:56:24 +00:00
parent 7050a4a6a2
commit cb40f0ff80
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/render/intern/raytrace/rayobject_vbvh.cpp
View File

@@ -270,6 +270,7 @@ void bvh_done<VBVHTree>(VBVHTree *obj)
pushup(root);
pushdown(root);
pushup_simd<VBVHNode,4>(root);
//Memory re-organize
if(0)

34
source/blender/render/intern/raytrace/reorganize.h
View File

@@ -144,6 +144,8 @@ void remove_useless(Node *node, Node **new_node)
template<class Node>
void pushup(Node *parent)
{
if(is_leaf(parent)) return;
float p_area = bb_area(parent->bb, parent->bb+3);
Node **prev = &parent->child;
for(Node *child = parent->child; RayObject_isAligned(child) && child; )
@@ -175,6 +177,38 @@ void pushup(Node *parent)
pushup(child);
}
/*
* try to optimize number of childs to be a multiple of SSize
*/
template<class Node, int SSize>
void pushup_simd(Node *parent)
{
if(is_leaf(parent)) return;
int n = count_childs(parent);
Node **prev = &parent->child;
for(Node *child = parent->child; RayObject_isAligned(child) && child; )
{
int cn = count_childs(child);
if(cn-1 <= (SSize - (n%SSize) ) % SSize && RayObject_isAligned(child->child) )
{
n += (cn - 1);
append_sibling(child, child->child);
child = child->sibling;
*prev = child;
}
else
{
*prev = child;
prev = &(*prev)->sibling;
child = *prev;
}
}
for(Node *child = parent->child; RayObject_isAligned(child) && child; child = child->sibling)
pushup_simd<Node,SSize>(child);
}
/*