Commit: 8d8316a057d335e37d2d51ca5a8d0ee1fed432c0 Author: Edward O'Callaghan Date: Wed Aug 24 12:30:05 2016 +0200 Branches: master https://developer.blender.org/rB8d8316a057d335e37d2d51ca5a8d0ee1fed432c0
Cycles: Consolidate the various split CL kernel feature defines within the AMD platform Reviewers: sergey Differential Revision: https://developer.blender.org/D2172 =================================================================== M intern/cycles/kernel/kernel_types.h =================================================================== diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 3152ec6..deebf87 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -113,16 +113,7 @@ CCL_NAMESPACE_BEGIN # ifdef __KERNEL_OPENCL_AMD__ # define __CL_USE_NATIVE__ # define __KERNEL_SHADING__ -# define __MULTI_CLOSURE__ -# define __PASSES__ -# define __BACKGROUND_MIS__ -# define __LAMP_MIS__ -# define __AO__ -# define __CAMERA_MOTION__ -# define __OBJECT_MOTION__ -# define __HAIR__ -# define __BAKING__ -# define __TRANSPARENT_SHADOWS__ +# define __KERNEL_ADV_SHADING__ # endif /* __KERNEL_OPENCL_AMD__ */ # ifdef __KERNEL_OPENCL_INTEL_CPU__ _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
