blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cycles: Remove "return" and "assert" from oneAPI kernel code

This commit is contained in:
Nikita Sirgienko 2022-08-29 19:16:41 +02:00
parent 1cd8ca49f9
commit 805d1063a0
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/device/oneapi/kernel.cpp
View File

@ -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) {

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 4d67fb6e2773619392b3d2099188ae742ef9662a
Subproject commit a2eb507891449a0b67582be9561840075513661d

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 32baafe44dc56edd1baf6e5a16b4439ded8238f2
Subproject commit 7a8502871c34db0343cc7de52d6b49b15a84238a

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit 42da56aa73726710107031787af5eea186797984
Subproject commit 95107484d076bc965239942e857c83433bfa86d7

2
source/tools

@ -1 +1 @@
Subproject commit 548055f40213c775a6b77025525c91e8466e70d6
Subproject commit da8bdd7244c7b6c2eadf4c949ff391d0cc430275