diff options
| author | Patrick Mours <pmours@nvidia.com> | 2019-11-28 15:57:02 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2019-11-28 15:57:02 +0300 |
| commit | 70a32adfeb41f9b3fc376a933fbdc2d11bb73c15 (patch) | |
| tree | 5f1d6639c093b818022969ce776d5dabc24ed695 /intern/cycles/bvh | |
| parent | d4835b88b23bce6c28d8514e35d771408d5ef18b (diff) | |
Fix assert in Cycles memory statistics when using OptiX on multiple GPUs
The acceleration structure built by OptiX may be different between GPUs, so cannot assume the memory size is the same for all.
This fixes that by moving the memory management for all OptiX acceleration structures into the responsibility of each device (was already the case for BLAS previously, now for TLAS too).
Diffstat (limited to 'intern/cycles/bvh')
| -rw-r--r-- | intern/cycles/bvh/bvh_optix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/bvh/bvh_optix.cpp b/intern/cycles/bvh/bvh_optix.cpp index b3a9aab3266..86d755ab06a 100644 --- a/intern/cycles/bvh/bvh_optix.cpp +++ b/intern/cycles/bvh/bvh_optix.cpp @@ -49,7 +49,7 @@ void BVHOptiX::copy_to_device(Progress &progress, DeviceScene *dscene) progress.set_status("Updating Scene BVH", "Building OptiX acceleration structure"); Device *const device = dscene->bvh_nodes.device; - if (!device->build_optix_bvh(this, dscene->bvh_nodes)) + if (!device->build_optix_bvh(this)) progress.set_error("Failed to build OptiX acceleration structure"); } |