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/bvh/bvh_multi.h | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 intern/cycles/bvh/bvh_multi.h (limited to 'intern/cycles/bvh/bvh_multi.h') diff --git a/intern/cycles/bvh/bvh_multi.h b/intern/cycles/bvh/bvh_multi.h new file mode 100644 index 00000000000..840438c5d0c --- /dev/null +++ b/intern/cycles/bvh/bvh_multi.h @@ -0,0 +1,39 @@ +/* + * Copyright 2020, 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_MULTI_H__ +#define __BVH_MULTI_H__ + +#include "bvh/bvh.h" +#include "bvh/bvh_params.h" + +CCL_NAMESPACE_BEGIN + +class BVHMulti : public BVH { + public: + vector sub_bvhs; + + protected: + friend class BVH; + BVHMulti(const BVHParams ¶ms, + const vector &geometry, + const vector &objects); + virtual ~BVHMulti(); +}; + +CCL_NAMESPACE_END + +#endif /* __BVH_MULTI_H__ */ -- cgit v1.2.3