diff options
author | Nikita Sirgienko <nikita.sirgienko@intel.com> | 2022-08-29 20:21:49 +0300 |
---|---|---|
committer | Nikita Sirgienko <nikita.sirgienko@intel.com> | 2022-08-29 20:21:49 +0300 |
commit | 658ff994c578aae5260c4b7933d95c6cb14f2652 (patch) | |
tree | 7e1745380743520eadc2c3a7c75960ae2c3197f1 /intern/cycles | |
parent | dff15bb5bf4cc85eea10a25a106babac52d7bec3 (diff) | |
parent | 805d1063a052d07e26e9c510d1b293b7b95172ed (diff) |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/kernel/device/oneapi/kernel.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/kernel/device/oneapi/kernel.cpp b/intern/cycles/kernel/device/oneapi/kernel.cpp index 22b2fd03706..332ad430f20 100644 --- a/intern/cycles/kernel/device/oneapi/kernel.cpp +++ b/intern/cycles/kernel/device/oneapi/kernel.cpp @@ -645,13 +645,9 @@ bool oneapi_enqueue_kernel(KernelContext *kernel_context, /* Unsupported kernels */ case DEVICE_KERNEL_NUM: case DEVICE_KERNEL_INTEGRATOR_MEGAKERNEL: - assert(0); - return false; + kernel_assert(0); + break; } - - /* Unknown kernel. */ - assert(0); - return false; }); } catch (sycl::exception const &e) { |