forked from bartvdbraak/blender
bf55afbf26
The title actually covers it all, This commit exploits all the work being done in previous changes to make it possible to build spatial splits in threads. Works quite nicely, but has a downside of some extra memory usage. In practice it doesn't seem to be a huge problem and that we can always look into later if it becomes a real showstopper. In practice it shows some nice speedup: - BMW27 scene takes 3 now (used to be 4) - Agent shot takes 5 sec (used to be 80) Such non-linear speedup is most likely coming from much less amount of heap re-allocations. A a downside, there's a bit of extra memory used by BVH arrays. From the tests amount of extra memory is below 0.001% so far, so it's not that bad at all. Reviewers: brecht, juicyfruit, dingto, lukasstockner97 Differential Revision: https://developer.blender.org/D1820
135 lines
3.7 KiB
C++
135 lines
3.7 KiB
C++
/*
|
|
* Adapted from code copyright 2009-2010 NVIDIA Corporation
|
|
* Modifications Copyright 2011, Blender Foundation.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef __BVH_BUILD_H__
|
|
#define __BVH_BUILD_H__
|
|
|
|
#include <float.h>
|
|
|
|
#include "bvh.h"
|
|
#include "bvh_binning.h"
|
|
|
|
#include "util_boundbox.h"
|
|
#include "util_task.h"
|
|
#include "util_vector.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
class BVHBuildTask;
|
|
class BVHSpatialSplitBuildTask;
|
|
class BVHParams;
|
|
class InnerNode;
|
|
class Mesh;
|
|
class Object;
|
|
class Progress;
|
|
|
|
/* BVH Builder */
|
|
|
|
class BVHBuild
|
|
{
|
|
public:
|
|
/* Constructor/Destructor */
|
|
BVHBuild(const vector<Object*>& objects,
|
|
array<int>& prim_type,
|
|
array<int>& prim_index,
|
|
array<int>& prim_object,
|
|
const BVHParams& params,
|
|
Progress& progress);
|
|
~BVHBuild();
|
|
|
|
BVHNode *run();
|
|
|
|
protected:
|
|
friend class BVHMixedSplit;
|
|
friend class BVHObjectSplit;
|
|
friend class BVHSpatialSplit;
|
|
friend class BVHBuildTask;
|
|
friend class BVHSpatialSplitBuildTask;
|
|
|
|
/* adding references */
|
|
void add_reference_mesh(BoundBox& root, BoundBox& center, Mesh *mesh, int i);
|
|
void add_reference_object(BoundBox& root, BoundBox& center, Object *ob, int i);
|
|
void add_references(BVHRange& root);
|
|
|
|
/* building */
|
|
BVHNode *build_node(const BVHRange& range,
|
|
vector<BVHReference> *references,
|
|
int level,
|
|
int thread_id);
|
|
BVHNode *build_node(const BVHObjectBinning& range, int level);
|
|
BVHNode *create_leaf_node(const BVHRange& range,
|
|
const vector<BVHReference>& references);
|
|
BVHNode *create_object_leaf_nodes(const BVHReference *ref, int start, int num);
|
|
|
|
bool range_within_max_leaf_size(const BVHRange& range,
|
|
const vector<BVHReference>& references) const;
|
|
|
|
/* threads */
|
|
enum { THREAD_TASK_SIZE = 4096 };
|
|
void thread_build_node(InnerNode *node,
|
|
int child,
|
|
BVHObjectBinning *range,
|
|
int level);
|
|
void thread_build_spatial_split_node(InnerNode *node,
|
|
int child,
|
|
BVHRange *range,
|
|
vector<BVHReference> *references,
|
|
int level,
|
|
int thread_id);
|
|
thread_mutex build_mutex;
|
|
|
|
/* progress */
|
|
void progress_update();
|
|
|
|
/* tree rotations */
|
|
void rotate(BVHNode *node, int max_depth);
|
|
void rotate(BVHNode *node, int max_depth, int iterations);
|
|
|
|
/* objects and primitive references */
|
|
vector<Object*> objects;
|
|
vector<BVHReference> references;
|
|
int num_original_references;
|
|
|
|
/* output primitive indexes and objects */
|
|
array<int>& prim_type;
|
|
array<int>& prim_index;
|
|
array<int>& prim_object;
|
|
|
|
/* build parameters */
|
|
BVHParams params;
|
|
|
|
/* progress reporting */
|
|
Progress& progress;
|
|
double progress_start_time;
|
|
size_t progress_count;
|
|
size_t progress_total;
|
|
size_t progress_original_total;
|
|
|
|
/* spatial splitting */
|
|
float spatial_min_overlap;
|
|
vector<BVHSpatialStorage> spatial_storage;
|
|
size_t spatial_free_index;
|
|
thread_spin_lock spatial_spin_lock;
|
|
|
|
/* threads */
|
|
TaskPool task_pool;
|
|
};
|
|
|
|
CCL_NAMESPACE_END
|
|
|
|
#endif /* __BVH_BUILD_H__ */
|