From bfb6fce6594e9cf133bd18aee311c1e5e32dc799 Mon Sep 17 00:00:00 2001 From: Patrick Mours Date: Thu, 10 Dec 2020 14:18:25 +0100 Subject: 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 --- intern/cycles/render/hair.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'intern/cycles/render/hair.h') 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 -- cgit v1.2.3