Cleanup: Remove some underlying code for the BVH disk cache.
authorThomas Dinges <blender@dingto.org>
Thu, 24 Sep 2015 13:47:27 +0000 (15:47 +0200)
committerThomas Dinges <blender@dingto.org>
Thu, 24 Sep 2015 13:47:27 +0000 (15:47 +0200)
Notes:
- There is still some bvh cache code, but that is from the engines initial commit, we might clean this up further or keep it.
- Changes in util_cache.h/.c are kept, this might be re-used in the future.

intern/cycles/bvh/bvh.cpp
intern/cycles/bvh/bvh.h
intern/cycles/render/mesh.cpp

index 350ca16f6e2c858b97761f35792bf6310bb17bfa..c8c885487e49414fe34fac1675a9d5ceb87e7b47 100644 (file)
@@ -102,7 +102,6 @@ bool BVH::cache_read(CacheData& key)
        CacheData value;
 
        if(Cache::global.lookup(key, value)) {
        CacheData value;
 
        if(Cache::global.lookup(key, value)) {
-               cache_filename = key.get_filename();
 
                if(!(value.read(pack.root_index) &&
                     value.read(pack.SAH) &&
 
                if(!(value.read(pack.root_index) &&
                     value.read(pack.SAH) &&
@@ -151,26 +150,6 @@ void BVH::cache_write(CacheData& key)
        value.add(pack.prim_object);
 
        Cache::global.insert(key, value);
        value.add(pack.prim_object);
 
        Cache::global.insert(key, value);
-
-       cache_filename = key.get_filename();
-}
-
-void BVH::clear_cache_except()
-{
-       set<string> except;
-
-       if(!cache_filename.empty())
-               except.insert(cache_filename);
-
-       foreach(Object *ob, objects) {
-               Mesh *mesh = ob->mesh;
-               BVH *bvh = mesh->bvh;
-
-               if(bvh && !bvh->cache_filename.empty())
-                       except.insert(bvh->cache_filename);
-       }
-
-       Cache::global.clear_except("bvh", except);
 }
 
 /* Building */
 }
 
 /* Building */
@@ -234,10 +213,6 @@ void BVH::build(Progress& progress)
        if(params.use_cache) {
                progress.set_substatus("Writing BVH cache");
                cache_write(key);
        if(params.use_cache) {
                progress.set_substatus("Writing BVH cache");
                cache_write(key);
-
-               /* clear other bvh files from cache */
-               if(params.top_level)
-                       clear_cache_except();
        }
 }
 
        }
 }
 
index 669d2ccdcd54ed41e6391b9f38797fbc2a095b1b..0ee5a309dc8f219c1bedf295a596a47874b4b289 100644 (file)
@@ -20,7 +20,6 @@
 
 #include "bvh_params.h"
 
 
 #include "bvh_params.h"
 
-#include "util_string.h"
 #include "util_types.h"
 #include "util_vector.h"
 
 #include "util_types.h"
 #include "util_vector.h"
 
@@ -87,7 +86,6 @@ public:
        PackedBVH pack;
        BVHParams params;
        vector<Object*> objects;
        PackedBVH pack;
        BVHParams params;
        vector<Object*> objects;
-       string cache_filename;
 
        static BVH *create(const BVHParams& params, const vector<Object*>& objects);
        virtual ~BVH() {}
 
        static BVH *create(const BVHParams& params, const vector<Object*>& objects);
        virtual ~BVH() {}
@@ -95,8 +93,6 @@ public:
        void build(Progress& progress);
        void refit(Progress& progress);
 
        void build(Progress& progress);
        void refit(Progress& progress);
 
-       void clear_cache_except();
-
 protected:
        BVH(const BVHParams& params, const vector<Object*>& objects);
 
 protected:
        BVH(const BVHParams& params, const vector<Object*>& objects);
 
index 45685fe59274f9625261da632a5e835b870d1a86..57f194651f840b12556291021ec761c84bfbd8c7 100644 (file)
@@ -513,7 +513,6 @@ void Mesh::compute_bvh(SceneParams *params, Progress *progress, int n, int total
                        progress->set_status(msg, "Building BVH");
 
                        BVHParams bparams;
                        progress->set_status(msg, "Building BVH");
 
                        BVHParams bparams;
-                       bparams.use_cache = params->use_bvh_cache;
                        bparams.use_spatial_split = params->use_bvh_spatial_split;
                        bparams.use_qbvh = params->use_qbvh;
 
                        bparams.use_spatial_split = params->use_bvh_spatial_split;
                        bparams.use_qbvh = params->use_qbvh;
 
@@ -1084,7 +1083,6 @@ void MeshManager::device_update_bvh(Device *device, DeviceScene *dscene, Scene *
        bparams.top_level = true;
        bparams.use_qbvh = scene->params.use_qbvh;
        bparams.use_spatial_split = scene->params.use_bvh_spatial_split;
        bparams.top_level = true;
        bparams.use_qbvh = scene->params.use_qbvh;
        bparams.use_spatial_split = scene->params.use_bvh_spatial_split;
-       bparams.use_cache = scene->params.use_bvh_cache;
 
        delete bvh;
        bvh = BVH::create(bparams, scene->objects);
 
        delete bvh;
        bvh = BVH::create(bparams, scene->objects);