forked from bartvdbraak/blender
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.
This commit is contained in:
parent
821e2ae37a
commit
cdbac018a2
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user