From 59b096ed00c545a7237db3a4d2768122740d675e Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 22 Jan 2013 14:49:52 +0000 Subject: Cycles: * Disable Lamp MIS on sm_20. Still enabled for CPU and sm_21 and above. --- intern/cycles/kernel/kernel_types.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index ce37b54f215..1236f43e018 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -44,6 +44,7 @@ CCL_NAMESPACE_BEGIN #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ #define __NON_PROGRESSIVE__ +#define __LAMP_MIS__ #define __HAIR__ #ifdef WITH_OSL #define __OSL__ @@ -55,6 +56,9 @@ CCL_NAMESPACE_BEGIN #if __CUDA_ARCH__ >= 200 #define __KERNEL_ADV_SHADING__ #endif +#if __CUDA_ARCH__ >= 210 +#define __LAMP_MIS__ +#endif #endif #ifdef __KERNEL_OPENCL__ @@ -112,7 +116,6 @@ CCL_NAMESPACE_BEGIN #define __TRANSPARENT_SHADOWS__ #define __PASSES__ #define __BACKGROUND_MIS__ -#define __LAMP_MIS__ #define __AO__ #define __ANISOTROPIC__ #define __CAMERA_MOTION__ -- cgit v1.2.3