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.
This commit is contained in:
Thomas Dinges
2013-02-06 23:19:14 +00:00
parent d686b1c20f
commit 8011cbc751

View File

@@ -44,7 +44,6 @@ CCL_NAMESPACE_BEGIN
#define __KERNEL_SHADING__ #define __KERNEL_SHADING__
#define __KERNEL_ADV_SHADING__ #define __KERNEL_ADV_SHADING__
#define __NON_PROGRESSIVE__ #define __NON_PROGRESSIVE__
#define __LAMP_MIS__
#define __HAIR__ #define __HAIR__
#ifdef WITH_OSL #ifdef WITH_OSL
#define __OSL__ #define __OSL__
@@ -56,9 +55,6 @@ CCL_NAMESPACE_BEGIN
#if __CUDA_ARCH__ >= 200 #if __CUDA_ARCH__ >= 200
#define __KERNEL_ADV_SHADING__ #define __KERNEL_ADV_SHADING__
#endif #endif
#if __CUDA_ARCH__ >= 210
#define __LAMP_MIS__
#endif
#endif #endif
#ifdef __KERNEL_OPENCL__ #ifdef __KERNEL_OPENCL__
@@ -116,6 +112,7 @@ CCL_NAMESPACE_BEGIN
#define __TRANSPARENT_SHADOWS__ #define __TRANSPARENT_SHADOWS__
#define __PASSES__ #define __PASSES__
#define __BACKGROUND_MIS__ #define __BACKGROUND_MIS__
#define __LAMP_MIS__
#define __AO__ #define __AO__
#define __ANISOTROPIC__ #define __ANISOTROPIC__
#define __CAMERA_MOTION__ #define __CAMERA_MOTION__