diff options
| author | Thomas Dinges <blender@dingto.org> | 2015-05-17 19:46:25 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2015-05-17 19:46:25 +0300 |
| commit | dae566894ae6908dfa3babc42f1c595b3acf0771 (patch) | |
| tree | 4957225281ab5504ab1704e88f7406bc1b3d5510 /intern/cycles/kernel/kernel_types.h | |
| parent | 14c2bc53c0b4e02ac64c91908ba92d156c52023e (diff) | |
Cycles / OpenCL: Enable Camera Motion and Hair for AMD.
Only enabled for the Experimental kernel though, so the feature set must
be changed in the UI to use the features.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 68cf6674b9d..54b78dec54d 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -96,7 +96,7 @@ CCL_NAMESPACE_BEGIN /* keep __KERNEL_ADV_SHADING__ in sync with opencl_kernel_use_advanced_shading! */ #ifdef __KERNEL_OPENCL_NVIDIA__ -#define __KERNEL_SHADING__ +# define __KERNEL_SHADING__ /* TODO(sergey): Advanced shading code still requires work * for split kernel. */ @@ -118,24 +118,24 @@ CCL_NAMESPACE_BEGIN #endif #ifdef __KERNEL_OPENCL_APPLE__ -#define __KERNEL_SHADING__ +# define __KERNEL_SHADING__ //#define __KERNEL_ADV_SHADING__ #endif #ifdef __KERNEL_OPENCL_AMD__ -#define __CL_USE_NATIVE__ -#define __KERNEL_SHADING__ -//__KERNEL_ADV_SHADING__ -#define __MULTI_CLOSURE__ -//#define __TRANSPARENT_SHADOWS__ -#define __PASSES__ -#define __BACKGROUND_MIS__ -#define __LAMP_MIS__ -#define __AO__ -//#define __CAMERA_MOTION__ +# define __CL_USE_NATIVE__ +# define __KERNEL_SHADING__ +# define __MULTI_CLOSURE__ +# define __PASSES__ +# define __BACKGROUND_MIS__ +# define __LAMP_MIS__ +# define __AO__ +# ifdef __KERNEL_EXPERIMENTAL__ +# define __CAMERA_MOTION__ +# define __HAIR__ +# endif //#define __OBJECT_MOTION__ -//#define __HAIR__ -//end __KERNEL_ADV_SHADING__ +//#define __TRANSPARENT_SHADOWS__ #endif #ifdef __KERNEL_OPENCL_INTEL_CPU__ |