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.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.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 54ffd4bc4df..c2d1512492c 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -206,36 +206,36 @@ void Device::draw_pixels(device_memory& rgba, int y, int w, int h, int dx, int d glDisable(GL_BLEND); } -Device *Device::create(DeviceInfo& info, Stats &stats, bool background) +Device *Device::create(DeviceInfo& info, Stats &stats, Profiler &profiler, bool background) { Device *device; switch(info.type) { case DEVICE_CPU: - device = device_cpu_create(info, stats, background); + device = device_cpu_create(info, stats, profiler, background); break; #ifdef WITH_CUDA case DEVICE_CUDA: if(device_cuda_init()) - device = device_cuda_create(info, stats, background); + device = device_cuda_create(info, stats, profiler, background); else device = NULL; break; #endif #ifdef WITH_MULTI case DEVICE_MULTI: - device = device_multi_create(info, stats, background); + device = device_multi_create(info, stats, profiler, background); break; #endif #ifdef WITH_NETWORK case DEVICE_NETWORK: - device = device_network_create(info, stats, "127.0.0.1"); + device = device_network_create(info, stats, profiler, "127.0.0.1"); break; #endif #ifdef WITH_OPENCL case DEVICE_OPENCL: if(device_opencl_init()) - device = device_opencl_create(info, stats, background); + device = device_opencl_create(info, stats, profiler, background); else device = NULL; break; |