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_opencl.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_opencl.cpp')
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 71410f80d57..1e8c6b2dd0e 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -27,7 +27,7 @@ CCL_NAMESPACE_BEGIN -Device *device_opencl_create(DeviceInfo& info, Stats &stats, bool background) +Device *device_opencl_create(DeviceInfo& info, Stats &stats, Profiler &profiler, bool background) { vector<OpenCLPlatformDevice> usable_devices; OpenCLInfo::get_usable_devices(&usable_devices); @@ -37,10 +37,10 @@ Device *device_opencl_create(DeviceInfo& info, Stats &stats, bool background) const cl_device_type device_type = platform_device.device_type; if(OpenCLInfo::kernel_use_split(platform_name, device_type)) { VLOG(1) << "Using split kernel."; - return opencl_create_split_device(info, stats, background); + return opencl_create_split_device(info, stats, profiler, background); } else { VLOG(1) << "Using mega kernel."; - return opencl_create_mega_device(info, stats, background); + return opencl_create_mega_device(info, stats, profiler, background); } } |