Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: disable motion blur for CUDA entirely now, also goes wrong on other

Browse Source 
architectures. Still did not find a good solution.
This commit is contained in:
Brecht Van Lommel
2012-10-20 15:09:27 +00:00
parent 18fa7589ef
commit e287c97fea
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/kernel/kernel_bvh.h
View 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

4
intern/cycles/kernel/kernel_types.h
View 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 */