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/device/device.h | |
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/device/device.h')
-rw-r--r-- | intern/cycles/device/device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 672d93c2581..66fcac921d3 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -407,7 +407,7 @@ class Device { const DeviceDrawParams &draw_params); /* acceleration structure building */ - virtual bool build_optix_bvh(BVH *, device_memory &) + virtual bool build_optix_bvh(BVH *) { return false; } |