kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: One more attempt to fix compilation of 32bit CUDA kernels

Browse Source
This commit is contained in:
Sergey Sharybin 2015-07-27 14:18:20 +02:00
parent 79ffa03620
commit 61e4800b45
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/util/util_math.h
View File

@ -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;