[Bf-blender-cvs] [a03a835] cycles_kernel_split: Cycles kernel split: Enable some features for split intel and nvidia kernels
Sergey Sharybin
noreply at git.blender.org
Sat May 9 14:47:25 CEST 2015
Commit: a03a8356481b527c99424041d18af092236cecec
Author: Sergey Sharybin
Date: Sat May 9 17:42:13 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rBa03a8356481b527c99424041d18af092236cecec
Cycles kernel split: Enable some features for split intel and nvidia kernels
There still some differences between split kernel and megakernel and this is
to be investigated further.
===================================================================
M intern/cycles/kernel/kernel_types.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index e3fa7fe..303a78d 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -102,6 +102,13 @@ CCL_NAMESPACE_BEGIN
*/
# ifndef __SPLIT_KERNEL__
# define __KERNEL_ADV_SHADING__
+# else
+# define __MULTI_CLOSURE__
+# define __TRANSPARENT_SHADOWS__
+# define __PASSES__
+# define __BACKGROUND_MIS__
+# define __LAMP_MIS__
+# define __AO__
# endif
#endif
@@ -134,6 +141,13 @@ CCL_NAMESPACE_BEGIN
*/
# ifndef __SPLIT_KERNEL__
# define __KERNEL_ADV_SHADING__
+# else
+# define __MULTI_CLOSURE__
+# define __TRANSPARENT_SHADOWS__
+# define __PASSES__
+# define __BACKGROUND_MIS__
+# define __LAMP_MIS__
+# define __AO__
# endif
#endif
More information about the Bf-blender-cvs
mailing list