diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-10-04 03:28:46 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-10-04 03:29:08 +0400 |
| commit | 6359c36ba4070ca041f9a22e52d0e1c11e2a61d1 (patch) | |
| tree | f8ef7b5668d68bcae50cbc782e7baac6e3da1b19 /intern | |
| parent | a9ae14c480e3ba1faf5fafe89bd4edb3b361b953 (diff) | |
Cycles: Remove a workaround for Titan GPUs, not needed anymore with the latest CUDA compiler.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh.h | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/intern/cycles/kernel/geom/geom_bvh.h b/intern/cycles/kernel/geom/geom_bvh.h index 26efddc78e0..4d06b05024d 100644 --- a/intern/cycles/kernel/geom/geom_bvh.h +++ b/intern/cycles/kernel/geom/geom_bvh.h @@ -161,13 +161,7 @@ CCL_NAMESPACE_BEGIN #include "geom_bvh_volume.h" #endif -/* to work around titan bug when using arrays instead of textures */ -#if !defined(__KERNEL_CUDA__) || defined(__KERNEL_CUDA_TEX_STORAGE__) -ccl_device_inline -#else -ccl_device_noinline -#endif -bool scene_intersect(KernelGlobals *kg, const Ray *ray, const uint visibility, Intersection *isect, +ccl_device_inline bool scene_intersect(KernelGlobals *kg, const Ray *ray, const uint visibility, Intersection *isect, uint *lcg_state, float difl, float extmax) { #ifdef __OBJECT_MOTION__ @@ -205,14 +199,8 @@ bool scene_intersect(KernelGlobals *kg, const Ray *ray, const uint visibility, I #endif /* __KERNEL_CPU__ */ } -/* to work around titan bug when using arrays instead of textures */ #ifdef __SUBSURFACE__ -#if !defined(__KERNEL_CUDA__) || defined(__KERNEL_CUDA_TEX_STORAGE__) -ccl_device_inline -#else -ccl_device_noinline -#endif -uint scene_intersect_subsurface(KernelGlobals *kg, const Ray *ray, Intersection *isect, int subsurface_object, uint *lcg_state, int max_hits) +ccl_device_inline uint scene_intersect_subsurface(KernelGlobals *kg, const Ray *ray, Intersection *isect, int subsurface_object, uint *lcg_state, int max_hits) { #ifdef __OBJECT_MOTION__ if(kernel_data.bvh.have_motion) { @@ -278,14 +266,8 @@ ccl_device_inline bool scene_intersect_shadow_all(KernelGlobals *kg, const Ray * } #endif -/* to work around titan bug when using arrays instead of textures */ #ifdef __VOLUME__ -#if !defined(__KERNEL_CUDA__) || defined(__KERNEL_CUDA_TEX_STORAGE__) -ccl_device_inline -#else -ccl_device_noinline -#endif -bool scene_intersect_volume(KernelGlobals *kg, +ccl_device_inline bool scene_intersect_volume(KernelGlobals *kg, const Ray *ray, Intersection *isect) { |