diff options
author | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
---|---|---|
committer | Howard Trickey <howard.trickey@gmail.com> | 2021-10-30 22:37:05 +0300 |
commit | e9bbfd0c8c7a508d220bf355722ff03f91e93183 (patch) | |
tree | 1230f26bc82f24547aeccbaa7fcd6d3db2655fd3 /intern/cycles/bvh/bvh_optix.cpp | |
parent | 1aa953bd1913c81b22c80a00edbf4ad88a32c52f (diff) | |
parent | 03a962d8cab44221650f59eb223cb0a767e05b2b (diff) |
Merge branch 'master' into soc-2020-io-performancesoc-2020-io-performance
Diffstat (limited to 'intern/cycles/bvh/bvh_optix.cpp')
-rw-r--r-- | intern/cycles/bvh/bvh_optix.cpp | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/intern/cycles/bvh/bvh_optix.cpp b/intern/cycles/bvh/bvh_optix.cpp deleted file mode 100644 index cd266f72f89..00000000000 --- a/intern/cycles/bvh/bvh_optix.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2019, NVIDIA Corporation. - * Copyright 2019, 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. - */ - -#ifdef WITH_OPTIX - -# include "device/device.h" - -# include "bvh/bvh_optix.h" - -CCL_NAMESPACE_BEGIN - -BVHOptiX::BVHOptiX(const BVHParams ¶ms_, - const vector<Geometry *> &geometry_, - const vector<Object *> &objects_, - Device *device) - : BVH(params_, geometry_, objects_), - device(device), - traversable_handle(0), - as_data(device, params_.top_level ? "optix tlas" : "optix blas", false), - motion_transform_data(device, "optix motion transform", false) -{ -} - -BVHOptiX::~BVHOptiX() -{ - // Acceleration structure memory is delayed freed on device, since deleting the - // BVH may happen while still being used for rendering. - device->release_optix_bvh(this); -} - -CCL_NAMESPACE_END - -#endif /* WITH_OPTIX */ |