ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Blender 2.76a: Fix CUDA compilation on 32bit platform

Browse source
This commit is contained in:
Sergey Sharybin 2015-10-29 20:11:22 +05:00
parent b5e4cc820b
commit de96d1acd1
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
intern/cycles/kernel/geom/geom_triangle_intersect.h
View file

@ -51,11 +51,7 @@ typedef struct IsectPrecalc {
#if defined(__KERNEL_CUDA__)
# if (defined(i386) || defined(_M_IX86))
# if __CUDA_ARCH__ > 500
ccl_device_noinline
# else /* __CUDA_ARCH__ > 500 */
ccl_device_inline
# endif /* __CUDA_ARCH__ > 500 */
# else /* (defined(i386) || defined(_M_IX86)) */
# if defined(__KERNEL_EXPERIMENTAL__) && (__CUDA_ARCH__ >= 500)
ccl_device_noinline
@ -201,7 +197,13 @@ ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
*/
#ifdef __SUBSURFACE__
ccl_device_inline void triangle_intersect_subsurface(
#if defined(__KERNEL_CUDA__) && (defined(i386) || defined(_M_IX86))
ccl_device_noinline
#else
ccl_device_inline
#endif
void triangle_intersect_subsurface(
KernelGlobals *kg,
const IsectPrecalc *isect_precalc,
Intersection *isect_array,