[Bf-blender-cvs] [6245f4a] master: Cycles: Enable advanced shading for NVidia OpenCL kernel

Sergey Sharybin noreply at git.blender.org
Tue May 26 18:29:32 CEST 2015


Commit: 6245f4a39cf054b520db01fc228ed3dfddc4749c
Author: Sergey Sharybin
Date:   Tue May 26 21:11:58 2015 +0500
Branches: master
https://developer.blender.org/rB6245f4a39cf054b520db01fc228ed3dfddc4749c

Cycles: Enable advanced shading for NVidia OpenCL kernel

It was kept disabled due to render artifacts which weer in fact caused by bad
memory access, which is fixed in the previous commit.

We now also can make it enabled in regular AMD split kernel after someone tests
the updated code.

===================================================================

M	intern/cycles/kernel/kernel_types.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 54b78de..bebd7fa 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -97,21 +97,7 @@ CCL_NAMESPACE_BEGIN
 
 #ifdef __KERNEL_OPENCL_NVIDIA__
 #  define __KERNEL_SHADING__
-/* TODO(sergey): Advanced shading code still requires work
- * for split kernel.
- */
-#  ifndef __SPLIT_KERNEL__
-#    define __KERNEL_ADV_SHADING__
-#  else
-#    define __MULTI_CLOSURE__
-#    define __TRANSPARENT_SHADOWS__
-#    define __PASSES__
-#    define __BACKGROUND_MIS__
-#    define __LAMP_MIS__
-#    define __AO__
-#    define __HAIR__
-#    define __CAMERA_MOTION__
-#  endif
+#  define __KERNEL_ADV_SHADING__
 #  ifdef __KERNEL_EXPERIMENTAL__
 #    define __CMJ__
 #  endif




More information about the Bf-blender-cvs mailing list