From 8011cbc751cc8eb3e3355f1037a8609909a53ee9 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 6 Feb 2013 23:19:14 +0000 Subject: [PATCH] CUDA / sm_20: * Enable Lamp MIS again, it works on a GTX 570 (which is sm_20) with latest SVN. Tested by vitos1k in IRC:. Feedback from GTX 580 users would be appreciated on this. --- intern/cycles/kernel/kernel_types.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 2ef3d71dd1d..52bdddc72fb 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -44,7 +44,6 @@ CCL_NAMESPACE_BEGIN #define __KERNEL_SHADING__ #define __KERNEL_ADV_SHADING__ #define __NON_PROGRESSIVE__ -#define __LAMP_MIS__ #define __HAIR__ #ifdef WITH_OSL #define __OSL__ @@ -56,9 +55,6 @@ CCL_NAMESPACE_BEGIN #if __CUDA_ARCH__ >= 200 #define __KERNEL_ADV_SHADING__ #endif -#if __CUDA_ARCH__ >= 210 -#define __LAMP_MIS__ -#endif #endif #ifdef __KERNEL_OPENCL__ @@ -116,6 +112,7 @@ CCL_NAMESPACE_BEGIN #define __TRANSPARENT_SHADOWS__ #define __PASSES__ #define __BACKGROUND_MIS__ +#define __LAMP_MIS__ #define __AO__ #define __ANISOTROPIC__ #define __CAMERA_MOTION__