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_intern.h | |
| 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_intern.h')
| -rw-r--r-- | intern/cycles/device/device_intern.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/device/device_intern.h b/intern/cycles/device/device_intern.h index e6495c2bff3..0b26057c3ba 100644 --- a/intern/cycles/device/device_intern.h +++ b/intern/cycles/device/device_intern.h @@ -21,13 +21,13 @@ CCL_NAMESPACE_BEGIN class Device; -Device *device_cpu_create(DeviceInfo& info, Stats &stats, bool background); +Device *device_cpu_create(DeviceInfo& info, Stats &stats, Profiler &profiler, bool background); bool device_opencl_init(); -Device *device_opencl_create(DeviceInfo& info, Stats &stats, bool background); +Device *device_opencl_create(DeviceInfo& info, Stats &stats, Profiler &profiler, bool background); bool device_cuda_init(); -Device *device_cuda_create(DeviceInfo& info, Stats &stats, bool background); -Device *device_network_create(DeviceInfo& info, Stats &stats, const char *address); -Device *device_multi_create(DeviceInfo& info, Stats &stats, bool background); +Device *device_cuda_create(DeviceInfo& info, Stats &stats, Profiler &profiler, bool background); +Device *device_network_create(DeviceInfo& info, Stats &stats, Profiler &profiler, const char *address); +Device *device_multi_create(DeviceInfo& info, Stats &stats, Profiler &profiler, bool background); void device_cpu_info(vector<DeviceInfo>& devices); void device_opencl_info(vector<DeviceInfo>& devices); |