Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove some more BVH cache code, for reading/writing the cache.

Browse Source
This commit is contained in:
Thomas Dinges
2015-09-24 16:49:10 +02:00
parent dfadf18659
commit 97a3fa17d6
2 changed files with 0 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
intern/cycles/bvh/bvh.cpp
View File

@@ -25,7 +25,6 @@
#include "bvh_node.h" #include "bvh_node.h"
#include "bvh_params.h" #include "bvh_params.h"
#include "util_cache.h"
#include "util_debug.h" #include "util_debug.h"
#include "util_foreach.h" #include "util_foreach.h"
#include "util_logging.h" #include "util_logging.h"
@@ -70,104 +69,12 @@ BVH *BVH::create(const BVHParams& params, const vector<Object*>& objects)
return new RegularBVH(params, objects); return new RegularBVH(params, objects);
} }
/* Cache */
bool BVH::cache_read(CacheData& key)
{
key.add(system_cpu_bits());
key.add(&params, sizeof(params));
foreach(Object *ob, objects) {
Mesh *mesh = ob->mesh;
key.add(mesh->verts);
key.add(mesh->triangles);
key.add(mesh->curve_keys);
key.add(mesh->curves);
key.add(&ob->bounds, sizeof(ob->bounds));
key.add(&ob->visibility, sizeof(ob->visibility));
key.add(&mesh->transform_applied, sizeof(bool));
if(mesh->use_motion_blur) {
Attribute *attr = mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
if(attr)
key.add(attr->buffer);
attr = mesh->curve_attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
if(attr)
key.add(attr->buffer);
}
}
CacheData value;
if(Cache::global.lookup(key, value)) {
if(!(value.read(pack.root_index) &&
value.read(pack.SAH) &&
value.read(pack.nodes) &&
value.read(pack.leaf_nodes) &&
value.read(pack.object_node) &&
value.read(pack.tri_woop) &&
value.read(pack.prim_type) &&
value.read(pack.prim_visibility) &&
value.read(pack.prim_index) &&
value.read(pack.prim_object)))
{
/* Clear the pack if load failed. */
pack.root_index = 0;
pack.SAH = 0.0f;
pack.nodes.clear();
pack.leaf_nodes.clear();
pack.object_node.clear();
pack.tri_woop.clear();
pack.prim_type.clear();
pack.prim_visibility.clear();
pack.prim_index.clear();
pack.prim_object.clear();
return false;
}
return true;
}
return false;
}
void BVH::cache_write(CacheData& key)
{
CacheData value;
value.add(pack.root_index);
value.add(pack.SAH);
value.add(pack.nodes);
value.add(pack.leaf_nodes);
value.add(pack.object_node);
value.add(pack.tri_woop);
value.add(pack.prim_type);
value.add(pack.prim_visibility);
value.add(pack.prim_index);
value.add(pack.prim_object);
Cache::global.insert(key, value);
}
/* Building */ /* Building */
void BVH::build(Progress& progress) void BVH::build(Progress& progress)
{ {
progress.set_substatus("Building BVH"); progress.set_substatus("Building BVH");
/* cache read */
CacheData key("bvh");
if(params.use_cache) {
progress.set_substatus("Looking in BVH cache");
if(cache_read(key))
return;
}
/* build nodes */ /* build nodes */
BVHBuild bvh_build(objects, BVHBuild bvh_build(objects,
pack.prim_type, pack.prim_type,
@@ -206,14 +113,6 @@ void BVH::build(Progress& progress)
/* free build nodes */ /* free build nodes */
root->deleteSubtree(); root->deleteSubtree();
if(progress.get_cancel()) return;
/* cache write */
if(params.use_cache) {
progress.set_substatus("Writing BVH cache");
cache_write(key);
}
} }
/* Refitting */ /* Refitting */

5
intern/cycles/bvh/bvh.h
View File

@@ -29,7 +29,6 @@ class BVHNode;
struct BVHStackEntry; struct BVHStackEntry;
class BVHParams; class BVHParams;
class BoundBox; class BoundBox;
class CacheData;
class LeafNode; class LeafNode;
class Object; class Object;
class Progress; class Progress;
@@ -96,10 +95,6 @@ public:
protected: protected:
BVH(const BVHParams& params, const vector<Object*>& objects); BVH(const BVHParams& params, const vector<Object*>& objects);
/* cache */
bool cache_read(CacheData& key);
void cache_write(CacheData& key);
/* triangles and strands*/ /* triangles and strands*/
void pack_primitives(); void pack_primitives();
void pack_triangle(int idx, float4 woop[3]); void pack_triangle(int idx, float4 woop[3]);