diff options
author | Nikita Sirgienko <nikita.sirgienko@intel.com> | 2022-08-29 20:16:41 +0300 |
---|---|---|
committer | Nikita Sirgienko <nikita.sirgienko@intel.com> | 2022-08-29 20:18:50 +0300 |
commit | 805d1063a052d07e26e9c510d1b293b7b95172ed (patch) | |
tree | 8f02e52d80f7ae9f4f5801ea43c6ea1d8dc92547 | |
parent | 1cd8ca49f9768d46fb64a0e875e64da92f07b995 (diff) |
Cycles: Remove "return" and "assert" from oneAPI kernel code
-rw-r--r-- | intern/cycles/kernel/device/oneapi/kernel.cpp | 8 | ||||
m--------- | release/datafiles/locale | 0 | ||||
m--------- | release/scripts/addons | 0 | ||||
m--------- | release/scripts/addons_contrib | 0 | ||||
m--------- | source/tools | 0 |
5 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) { diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 4d67fb6e2773619392b3d2099188ae742ef9662 +Subproject a2eb507891449a0b67582be9561840075513661 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 32baafe44dc56edd1baf6e5a16b4439ded8238f +Subproject 7a8502871c34db0343cc7de52d6b49b15a84238 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 42da56aa73726710107031787af5eea18679798 +Subproject 95107484d076bc965239942e857c83433bfa86d diff --git a/source/tools b/source/tools -Subproject 548055f40213c775a6b77025525c91e8466e70d +Subproject da8bdd7244c7b6c2eadf4c949ff391d0cc43027 |