diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-27 15:18:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-27 15:18:20 +0300 |
| commit | 61e4800b45dc0c079449e07cf9b4d73dba3156e6 (patch) | |
| tree | 7b9e70aa77a45e51bfc20807c44027ca856603a3 /intern/cycles/util | |
| parent | 79ffa03620cdd29b0cd234092ae4ebe2d82a5bec (diff) | |
Cycles: One more attempt to fix compilation of 32bit CUDA kernels
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_math.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 2262f8fdbb7..2bf62df3708 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -1447,10 +1447,14 @@ ccl_device bool ray_triangle_intersect_uv( return true; } -ccl_device bool ray_quad_intersect( - float3 ray_P, float3 ray_D, float ray_t, - float3 quad_P, float3 quad_u, float3 quad_v, - float3 *isect_P, float *isect_t) +#if defined(__KERNEL_CUDA__) && (defined(i386) || defined(_M_IX86)) +ccl_device_noinline +#else +ccl_device +#endif +bool ray_quad_intersect(float3 ray_P, float3 ray_D, float ray_t, + float3 quad_P, float3 quad_u, float3 quad_v, + float3 *isect_P, float *isect_t) { float3 v0 = quad_P - quad_u*0.5f - quad_v*0.5f; float3 v1 = quad_P + quad_u*0.5f - quad_v*0.5f; |