336ca6796a
Happens when device runs out of memory and Cycles is moving some textures to the host memory. The delayed memory free for OptiX BVH was moving data from one device_memory to another, leaving the original device memory in an invalid state. This was ruining the allocation map in the CUDA device which is using pointer to the device_memory. This change makes it so the memory pointer is stolen from BVH into the delayed memory free list. Additionally, forbid copying and moving instances of device_memory and added sanity checks in the device implementation. Differential Revision: https://developer.blender.org/D13316
50 lines
1.5 KiB
C++
50 lines
1.5 KiB
C++
/*
|
|
* 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/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(make_unique<device_only_memory<char>>(
|
|
device, params.top_level ? "optix tlas" : "optix blas", false)),
|
|
motion_transform_data(
|
|
make_unique<device_only_memory<char>>(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 */
|