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

[Thomas Dinges]

Revision: 54362
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54362
Author:   dingto
Date:     2013-02-06 23:19:14 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
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. 

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-02-06 22:48:35 UTC (rev 54361)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2013-02-06 23:19:14 UTC (rev 54362)
@@ -44,7 +44,6 @@
 #define __KERNEL_SHADING__
 #define __KERNEL_ADV_SHADING__
 #define __NON_PROGRESSIVE__
-#define __LAMP_MIS__
 #define __HAIR__
 #ifdef WITH_OSL
 #define __OSL__
@@ -56,10 +55,7 @@
 #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 @@
 #define __TRANSPARENT_SHADOWS__
 #define __PASSES__
 #define __BACKGROUND_MIS__
+#define __LAMP_MIS__
 #define __AO__
 #define __ANISOTROPIC__
 #define __CAMERA_MOTION__