Merge branch 'blender-v3.3-release'

2022-08-29 19:21:49 +02:00 · 2022-08-29 19:21:49 +02:00 · 658ff994c5
parent dff15bb5bf 805d1063a0
commit 658ff994c5
1 changed files with 2 additions and 6 deletions
--- 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) {