[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53998] trunk/blender/intern/cycles/kernel /kernel_types.h: Cycles:

[Thomas Dinges]

Revision: 53998
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53998
Author:   dingto
Date:     2013-01-22 14:49:52 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
Cycles:
* Disable Lamp MIS on sm_20. Still enabled for CPU and sm_21 and above. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_types.h

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2013-01-22 14:25:20 UTC (rev 53997)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2013-01-22 14:49:52 UTC (rev 53998)
@@ -44,6 +44,7 @@
 #define __KERNEL_SHADING__
 #define __KERNEL_ADV_SHADING__
 #define __NON_PROGRESSIVE__
+#define __LAMP_MIS__
 #define __HAIR__
 #ifdef WITH_OSL
 #define __OSL__
@@ -55,7 +56,10 @@
 #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 @@
 #define __TRANSPARENT_SHADOWS__
 #define __PASSES__
 #define __BACKGROUND_MIS__
-#define __LAMP_MIS__
 #define __AO__
 #define __ANISOTROPIC__
 #define __CAMERA_MOTION__