Cycles: disable motion blur for CUDA entirely now, also goes wrong on other
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 20 Oct 2012 15:09:27 +0000 (15:09 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 20 Oct 2012 15:09:27 +0000 (15:09 +0000)
architectures. Still did not find a good solution.

intern/cycles/kernel/kernel_bvh.h
intern/cycles/kernel/kernel_types.h

index e3c8b796e9ca87b0645c1301700a84e4ddc4f1a6..d70485fd6cf7ecff767cc268a6941dd288ca8374 100644 (file)
@@ -444,15 +444,10 @@ __device_inline bool bvh_intersect_motion(KernelGlobals *kg, const Ray *ray, con
 __device_inline bool scene_intersect(KernelGlobals *kg, const Ray *ray, const uint visibility, Intersection *isect)
 {
 #ifdef __OBJECT_MOTION__
-#if !defined(__KERNEL_CUDA__) || (__CUDA_ARCH__ >= 210)
        if(kernel_data.bvh.have_motion)
                return bvh_intersect_motion(kg, ray, visibility, isect);
        else
                return bvh_intersect(kg, ray, visibility, isect);
-#else
-       /* todo: fix cuda sm 2.0 motion blur */
-       return bvh_intersect(kg, ray, visibility, isect);
-#endif
 #else
        return bvh_intersect(kg, ray, visibility, isect);
 #endif
index c341269f4ca8dc408db9ba15de060839813c4672..94a55738f2bd9adb708596145f682996a4eeda6f 100644 (file)
@@ -109,9 +109,13 @@ CCL_NAMESPACE_BEGIN
 #define __BACKGROUND_MIS__
 #define __AO__
 #define __CAMERA_MOTION__
+
+#ifndef __KERNEL_CUDA__
 #define __OBJECT_MOTION__
 #endif
 
+#endif
+
 //#define __SOBOL_FULL_SCREEN__
 
 /* Shader Evaluation */