diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:54:30 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-30 01:54:30 +0300 |
| commit | 63c06531707c14c3c93c9f84d39a77aaf75c3634 (patch) | |
| tree | 700445b404cc5ebfa09fea62c53b9a64db049b9e /intern/cycles/device/device.cpp | |
| parent | 679b156756e070a779e97af7d5a34ddf0b164836 (diff) | |
| parent | a8b8da55672c2177c55709321df3514355b513f4 (diff) | |
Merge branch 'master' into blender2.8
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 b0ca9e1f0dd..be35b90bff0 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -349,36 +349,36 @@ void Device::draw_pixels( } } -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; |