diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-26 19:11:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-05-26 19:29:21 +0300 |
| commit | 6245f4a39cf054b520db01fc228ed3dfddc4749c (patch) | |
| tree | 616b6e3601220bae95e8e382fc2837d90b4c91b7 /intern | |
| parent | cf19012fb0f61f4b1af6c05d3fbce9649a56147c (diff) | |
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.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 54b78dec54d..bebd7fa0400 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 |