Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / OpenCL: Enable Camera Motion and Hair for AMD.

Browse Source 
Only enabled for the Experimental kernel though, so the feature set must
be changed in the UI to use the features.
This commit is contained in:
Thomas Dinges
2015-05-17 18:46:25 +02:00
parent 14c2bc53c0
commit dae566894a
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
intern/cycles/kernel/kernel_types.h
View File

@@ -96,7 +96,7 @@ CCL_NAMESPACE_BEGIN
/* keep __KERNEL_ADV_SHADING__ in sync with opencl_kernel_use_advanced_shading! */ /* keep __KERNEL_ADV_SHADING__ in sync with opencl_kernel_use_advanced_shading! */
#ifdef __KERNEL_OPENCL_NVIDIA__ #ifdef __KERNEL_OPENCL_NVIDIA__
#define __KERNEL_SHADING__ # define __KERNEL_SHADING__
/* TODO(sergey): Advanced shading code still requires work /* TODO(sergey): Advanced shading code still requires work
* for split kernel. * for split kernel.
*/ */
@@ -118,24 +118,24 @@ CCL_NAMESPACE_BEGIN
#endif #endif
#ifdef __KERNEL_OPENCL_APPLE__ #ifdef __KERNEL_OPENCL_APPLE__
#define __KERNEL_SHADING__ # define __KERNEL_SHADING__
//#define __KERNEL_ADV_SHADING__ //#define __KERNEL_ADV_SHADING__
#endif #endif
#ifdef __KERNEL_OPENCL_AMD__ #ifdef __KERNEL_OPENCL_AMD__
#define __CL_USE_NATIVE__ # define __CL_USE_NATIVE__
#define __KERNEL_SHADING__ # define __KERNEL_SHADING__
//__KERNEL_ADV_SHADING__ # define __MULTI_CLOSURE__
#define __MULTI_CLOSURE__ # define __PASSES__
//#define __TRANSPARENT_SHADOWS__ # define __BACKGROUND_MIS__
#define __PASSES__ # define __LAMP_MIS__
#define __BACKGROUND_MIS__ # define __AO__
#define __LAMP_MIS__ # ifdef __KERNEL_EXPERIMENTAL__
#define __AO__ # define __CAMERA_MOTION__
//#define __CAMERA_MOTION__ # define __HAIR__
# endif
//#define __OBJECT_MOTION__ //#define __OBJECT_MOTION__
//#define __HAIR__ //#define __TRANSPARENT_SHADOWS__
//end __KERNEL_ADV_SHADING__
#endif #endif
#ifdef __KERNEL_OPENCL_INTEL_CPU__ #ifdef __KERNEL_OPENCL_INTEL_CPU__