Attempt to fix #35665: disable correlated multi jitter sampling on the GPU for now,
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 10 Jun 2013 19:01:37 +0000 (19:01 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 10 Jun 2013 19:01:37 +0000 (19:01 +0000)
seems to be giving issues with CUDA 4.2 but I can't figure out why exactly.

intern/cycles/kernel/kernel_types.h

index 771c79ba637b56835fdf552ac56d040876f045da..9785f2e8320cc17acc8fbfac1146a73906912238 100644 (file)
@@ -55,6 +55,7 @@ CCL_NAMESPACE_BEGIN
 #define __OSL__
 #endif
 #define __SUBSURFACE__
+#define __CMJ__
 #endif
 
 #ifdef __KERNEL_CUDA__
@@ -117,7 +118,6 @@ CCL_NAMESPACE_BEGIN
 #define __CAMERA_CLIPPING__
 #define __INTERSECTION_REFINE__
 #define __CLAMP_SAMPLE__
-#define __CMJ__
 
 #ifdef __KERNEL_SHADING__
 #define __SVM__