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

Cycles: Cleanup, move utility function to utility file

Browse Source 
Was an old TODO, this function is handy for some math utilities as well.
This commit is contained in:
Sergey Sharybin 2017-03-23 12:55:51 +01:00
parent aa0602130b
commit b797a5ff78
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/geom/geom_triangle_intersect.h
View File

@ -96,12 +96,6 @@ void triangle_intersect_precalc(float3 dir,
isect_precalc->kz = kz; isect_precalc->kz = kz;
} }
/* TODO(sergey): Make it general utility function. */
ccl_device_inline float xor_signmask(float x, int y)
{
return __int_as_float(__float_as_int(x) ^ y);
}
ccl_device_inline bool triangle_intersect(KernelGlobals *kg, ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
const IsectPrecalc *isect_precalc, const IsectPrecalc *isect_precalc,
Intersection *isect, Intersection *isect,

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

@ -1451,6 +1451,11 @@ ccl_device_inline float beta(float x, float y)
#endif #endif
} }
ccl_device_inline float xor_signmask(float x, int y)
{
return __int_as_float(__float_as_int(x) ^ y);
}
/* projections */ /* projections */
ccl_device_inline float2 map_to_tube(const float3 co) ccl_device_inline float2 map_to_tube(const float3 co)
{ {