diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:30:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:43:27 +0300 |
| commit | a8b8da55672c2177c55709321df3514355b513f4 (patch) | |
| tree | 97c730a1b39e60ecd15ad5c73b63892329daae1e /intern/cycles/device/device_cuda.cpp | |
| parent | 8ac2d85d2fd3f8b997e9c9bddadada0dc7bdaf37 (diff) | |
Fix T58183: crash with CPU + GPU rendering after profiling changes.
Multi-device was not passing along profiler to the CPU.
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 46e7b043603..7b3c25a86d5 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -236,8 +236,8 @@ public: cuda_error_documentation(); } - CUDADevice(DeviceInfo& info, Stats &stats, bool background_) - : Device(info, stats, background_), + CUDADevice(DeviceInfo& info, Stats &stats, Profiler &profiler, bool background_) + : Device(info, stats, profiler, background_), texture_info(this, "__texture_info", MEM_TEXTURE) { first_error = true; @@ -2396,9 +2396,9 @@ bool device_cuda_init() #endif /* WITH_CUDA_DYNLOAD */ } -Device *device_cuda_create(DeviceInfo& info, Stats &stats, bool background) +Device *device_cuda_create(DeviceInfo& info, Stats &stats, Profiler &profiler, bool background) { - return new CUDADevice(info, stats, background); + return new CUDADevice(info, stats, profiler, background); } static CUresult device_cuda_safe_init() |