From f146317b092990b65437ecc5ac85d0a659e81ee4 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 15 Jan 2013 19:02:17 +0000 Subject: Cycles: * CUDA: Make it more clear that sm_12 and below is not supported. * OpenCL: __KERNEL_SHADING__ was declared twice for nvidia opencl device. * Some reshuffle of defines in kernel_types.h. No functional changes. --- intern/cycles/kernel/kernel_types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'intern/cycles/kernel/kernel_types.h') diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index dcd7220be1d..149a4470515 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -43,11 +43,11 @@ CCL_NAMESPACE_BEGIN #ifdef __KERNEL_CPU__ #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ +#define __NON_PROGRESSIVE__ +#define __HAIR__ #ifdef WITH_OSL #define __OSL__ #endif -#define __NON_PROGRESSIVE__ -#define __HAIR__ #endif #ifdef __KERNEL_CUDA__ @@ -112,11 +112,11 @@ CCL_NAMESPACE_BEGIN #define __TRANSPARENT_SHADOWS__ #define __PASSES__ #define __BACKGROUND_MIS__ +#define __LAMP_MIS__ #define __AO__ -#define __CAMERA_MOTION__ #define __ANISOTROPIC__ +#define __CAMERA_MOTION__ #define __OBJECT_MOTION__ -#define __LAMP_MIS__ #endif //#define __SOBOL_FULL_SCREEN__ -- cgit v1.2.3