diff options
author | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
commit | 42b0389a9b05e51e17ba79540e88cd446b52fae7 (patch) | |
tree | ee17716640f1b1133ae2ab4ca65cd92a63d09f15 /intern/cycles/bvh/bvh_optix.h | |
parent | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (diff) | |
parent | e7b698327cd91b371ff4fd43d1c117637224fded (diff) |
Merge remote-tracking branch 'origin/master' into geometry-nodesgeometry-nodes
Diffstat (limited to 'intern/cycles/bvh/bvh_optix.h')
-rw-r--r-- | intern/cycles/bvh/bvh_optix.h | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/intern/cycles/bvh/bvh_optix.h b/intern/cycles/bvh/bvh_optix.h index 663cba67260..aa514beae0d 100644 --- a/intern/cycles/bvh/bvh_optix.h +++ b/intern/cycles/bvh/bvh_optix.h @@ -26,33 +26,19 @@ CCL_NAMESPACE_BEGIN -class Geometry; -class Optix; - class BVHOptiX : public BVH { - friend class BVH; - public: - uint64_t optix_handle; - uint64_t optix_data_handle; - bool do_refit; + uint64_t traversable_handle; + device_only_memory<char> as_data; + device_only_memory<char> motion_transform_data; + protected: + friend class BVH; BVHOptiX(const BVHParams ¶ms, const vector<Geometry *> &geometry, - const vector<Object *> &objects); + const vector<Object *> &objects, + Device *device); virtual ~BVHOptiX(); - - virtual void build(Progress &progress, Stats *) override; - virtual void copy_to_device(Progress &progress, DeviceScene *dscene) override; - - private: - void pack_blas(); - void pack_tlas(); - - virtual void pack_nodes(const BVHNode *) override; - virtual void refit_nodes() override; - - virtual BVHNode *widen_children_nodes(const BVHNode *) override; }; CCL_NAMESPACE_END |