diff options
author | Patrick Mours <pmours@nvidia.com> | 2020-12-10 16:18:25 +0300 |
---|---|---|
committer | Patrick Mours <pmours@nvidia.com> | 2020-12-11 15:24:29 +0300 |
commit | bfb6fce6594e9cf133bd18aee311c1e5e32dc799 (patch) | |
tree | 7c813e17ea87e9aae64221b3ac7a8d42ab894c85 /intern/cycles/render/hair.h | |
parent | d72ec16e70721408c875040325c984941687b4a2 (diff) |
Cycles: Add CPU+GPU rendering support with OptiX
Adds support for building multiple BVH types in order to support using both CPU and OptiX
devices for rendering simultaneously. Primitive packing for Embree and OptiX is now
standalone, so it only needs to be run once and can be shared between the two. Additionally,
BVH building was made a device call, so that each device backend can decide how to
perform the building. The multi-device for instance creates a special multi-BVH that holds
references to several sub-BVHs, one for each sub-device.
Reviewed By: brecht, kevindietrich
Differential Revision: https://developer.blender.org/D9718
Diffstat (limited to 'intern/cycles/render/hair.h')
-rw-r--r-- | intern/cycles/render/hair.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/hair.h b/intern/cycles/render/hair.h index 32c5b00e879..d86a34fb87b 100644 --- a/intern/cycles/render/hair.h +++ b/intern/cycles/render/hair.h @@ -145,6 +145,8 @@ class Hair : public Geometry { /* BVH */ void pack_curves(Scene *scene, float4 *curve_key_co, float4 *curve_data, size_t curvekey_offset); + + void pack_primitives(PackedBVH &pack, int object, uint visibility); }; CCL_NAMESPACE_END |