From e287c97fea74debb88b73de695b155fb172fa7c6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 20 Oct 2012 15:09:27 +0000 Subject: [PATCH] Cycles: disable motion blur for CUDA entirely now, also goes wrong on other architectures. Still did not find a good solution. --- intern/cycles/kernel/kernel_bvh.h | 5 ----- intern/cycles/kernel/kernel_types.h | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/intern/cycles/kernel/kernel_bvh.h b/intern/cycles/kernel/kernel_bvh.h index e3c8b796e9c..d70485fd6cf 100644 --- a/intern/cycles/kernel/kernel_bvh.h +++ b/intern/cycles/kernel/kernel_bvh.h @@ -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 diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index c341269f4ca..94a55738f2b 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -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 */