diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-10-03 22:41:38 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-10-03 22:41:38 +0400 |
| commit | cdbac018a2744949683b9206cec1f3e5ea64b679 (patch) | |
| tree | da1859ac87f0bf0bc7301337dca449424c3e1e90 | |
| parent | 821e2ae37a5e035d78a72b5ebff7204975877a38 (diff) | |
Cycles, some tweaks to scene_intersect_shadow_all()
* Function returns a bool, not an uint.
* Remove GPU ifdefs, this is CPU only due to malloc / qsort.
| -rw-r--r-- | intern/cycles/kernel/geom/geom_bvh.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/intern/cycles/kernel/geom/geom_bvh.h b/intern/cycles/kernel/geom/geom_bvh.h index 807b23d15e5..26efddc78e0 100644 --- a/intern/cycles/kernel/geom/geom_bvh.h +++ b/intern/cycles/kernel/geom/geom_bvh.h @@ -250,14 +250,8 @@ uint scene_intersect_subsurface(KernelGlobals *kg, const Ray *ray, Intersection } #endif -/* to work around titan bug when using arrays instead of textures */ #ifdef __SHADOW_RECORD_ALL__ -#if !defined(__KERNEL_CUDA__) || defined(__KERNEL_CUDA_TEX_STORAGE__) -ccl_device_inline -#else -ccl_device_noinline -#endif -uint scene_intersect_shadow_all(KernelGlobals *kg, const Ray *ray, Intersection *isect, uint max_hits, uint *num_hits) +ccl_device_inline bool scene_intersect_shadow_all(KernelGlobals *kg, const Ray *ray, Intersection *isect, uint max_hits, uint *num_hits) { #ifdef __OBJECT_MOTION__ if(kernel_data.bvh.have_motion) { @@ -275,23 +269,12 @@ uint scene_intersect_shadow_all(KernelGlobals *kg, const Ray *ray, Intersection return bvh_intersect_shadow_all_hair(kg, ray, isect, max_hits, num_hits); #endif /* __HAIR__ */ -#ifdef __KERNEL_CPU__ - #ifdef __INSTANCING__ if(kernel_data.bvh.have_instancing) return bvh_intersect_shadow_all_instancing(kg, ray, isect, max_hits, num_hits); #endif /* __INSTANCING__ */ return bvh_intersect_shadow_all(kg, ray, isect, max_hits, num_hits); -#else /* __KERNEL_CPU__ */ - -#ifdef __INSTANCING__ - return bvh_intersect_shadow_all_instancing(kg, ray, isect, max_hits, num_hits); -#else - return bvh_intersect_shadow_all(kg, ray, isect, max_hits, num_hits); -#endif /* __INSTANCING__ */ - -#endif /* __KERNEL_CPU__ */ } #endif |