diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-11-06 00:33:08 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-11-06 00:33:08 +0300 |
| commit | 9e611c5616aa27c43ed067d184f94e6e9c9f5ffc (patch) | |
| tree | cd28326cdcf24ae83f2ca64bc2b1ad1776101c02 /intern/cycles/device/device.cpp | |
| parent | f0bc7f3261b823fe4efbe802ec6a2f3471bedd47 (diff) | |
| parent | 9be49a10699417aa5902144d99ff70e5e1fc6af8 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 3756fc251c0..bfbcdb20d5e 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -23,6 +23,7 @@ #include "device/queue.h" #include "device/cpu/device.h" +#include "device/cpu/kernel.h" #include "device/cuda/device.h" #include "device/dummy/device.h" #include "device/hip/device.h" @@ -361,10 +362,11 @@ unique_ptr<DeviceQueue> Device::gpu_queue_create() return nullptr; } -const CPUKernels *Device::get_cpu_kernels() const +const CPUKernels &Device::get_cpu_kernels() { - LOG(FATAL) << "Device does not support CPU kernels."; - return nullptr; + /* Initialize CPU kernels once and reuse. */ + static CPUKernels kernels; + return kernels; } void Device::get_cpu_kernel_thread_globals( |