From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- intern/cycles/util/util_math_int3.h | 82 ++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 42 deletions(-) (limited to 'intern/cycles/util/util_math_int3.h') diff --git a/intern/cycles/util/util_math_int3.h b/intern/cycles/util/util_math_int3.h index 2f4752f90f1..d92ed895dc2 100644 --- a/intern/cycles/util/util_math_int3.h +++ b/intern/cycles/util/util_math_int3.h @@ -30,9 +30,9 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_OPENCL__ ccl_device_inline int3 min(int3 a, int3 b); ccl_device_inline int3 max(int3 a, int3 b); -ccl_device_inline int3 clamp(const int3& a, int mn, int mx); -ccl_device_inline int3 clamp(const int3& a, int3& mn, int mx); -#endif /* !__KERNEL_OPENCL__ */ +ccl_device_inline int3 clamp(const int3 &a, int mn, int mx); +ccl_device_inline int3 clamp(const int3 &a, int3 &mn, int mx); +#endif /* !__KERNEL_OPENCL__ */ /******************************************************************************* * Definition. @@ -41,76 +41,74 @@ ccl_device_inline int3 clamp(const int3& a, int3& mn, int mx); #ifndef __KERNEL_OPENCL__ ccl_device_inline int3 min(int3 a, int3 b) { -#if defined(__KERNEL_SSE__) && defined(__KERNEL_SSE41__) - return int3(_mm_min_epi32(a.m128, b.m128)); -#else - return make_int3(min(a.x, b.x), min(a.y, b.y), min(a.z, b.z)); -#endif +# if defined(__KERNEL_SSE__) && defined(__KERNEL_SSE41__) + return int3(_mm_min_epi32(a.m128, b.m128)); +# else + return make_int3(min(a.x, b.x), min(a.y, b.y), min(a.z, b.z)); +# endif } ccl_device_inline int3 max(int3 a, int3 b) { -#if defined(__KERNEL_SSE__) && defined(__KERNEL_SSE41__) - return int3(_mm_max_epi32(a.m128, b.m128)); -#else - return make_int3(max(a.x, b.x), max(a.y, b.y), max(a.z, b.z)); -#endif +# if defined(__KERNEL_SSE__) && defined(__KERNEL_SSE41__) + return int3(_mm_max_epi32(a.m128, b.m128)); +# else + return make_int3(max(a.x, b.x), max(a.y, b.y), max(a.z, b.z)); +# endif } -ccl_device_inline int3 clamp(const int3& a, int mn, int mx) +ccl_device_inline int3 clamp(const int3 &a, int mn, int mx) { -#ifdef __KERNEL_SSE__ - return min(max(a, make_int3(mn)), make_int3(mx)); -#else - return make_int3(clamp(a.x, mn, mx), clamp(a.y, mn, mx), clamp(a.z, mn, mx)); -#endif +# ifdef __KERNEL_SSE__ + return min(max(a, make_int3(mn)), make_int3(mx)); +# else + return make_int3(clamp(a.x, mn, mx), clamp(a.y, mn, mx), clamp(a.z, mn, mx)); +# endif } -ccl_device_inline int3 clamp(const int3& a, int3& mn, int mx) +ccl_device_inline int3 clamp(const int3 &a, int3 &mn, int mx) { -#ifdef __KERNEL_SSE__ - return min(max(a, mn), make_int3(mx)); -#else - return make_int3(clamp(a.x, mn.x, mx), - clamp(a.y, mn.y, mx), - clamp(a.z, mn.z, mx)); -#endif +# ifdef __KERNEL_SSE__ + return min(max(a, mn), make_int3(mx)); +# else + return make_int3(clamp(a.x, mn.x, mx), clamp(a.y, mn.y, mx), clamp(a.z, mn.z, mx)); +# endif } ccl_device_inline bool operator==(const int3 &a, const int3 &b) { - return a.x == b.x && a.y == b.y && a.z == b.z; + return a.x == b.x && a.y == b.y && a.z == b.z; } ccl_device_inline bool operator!=(const int3 &a, const int3 &b) { - return !(a == b); + return !(a == b); } ccl_device_inline bool operator<(const int3 &a, const int3 &b) { - return a.x < b.x && a.y < b.y && a.z < b.z; + return a.x < b.x && a.y < b.y && a.z < b.z; } ccl_device_inline int3 operator+(const int3 &a, const int3 &b) { -#ifdef __KERNEL_SSE__ - return int3(_mm_add_epi32(a.m128, b.m128)); -#else - return make_int3(a.x + b.x, a.y + b.y, a.z + b.z); -#endif +# ifdef __KERNEL_SSE__ + return int3(_mm_add_epi32(a.m128, b.m128)); +# else + return make_int3(a.x + b.x, a.y + b.y, a.z + b.z); +# endif } ccl_device_inline int3 operator-(const int3 &a, const int3 &b) { -#ifdef __KERNEL_SSE__ - return int3(_mm_sub_epi32(a.m128, b.m128)); -#else - return make_int3(a.x - b.x, a.y - b.y, a.z - b.z); -#endif +# ifdef __KERNEL_SSE__ + return int3(_mm_sub_epi32(a.m128, b.m128)); +# else + return make_int3(a.x - b.x, a.y - b.y, a.z - b.z); +# endif } -#endif /* !__KERNEL_OPENCL__ */ +#endif /* !__KERNEL_OPENCL__ */ CCL_NAMESPACE_END -#endif /* __UTIL_MATH_INT3_H__ */ +#endif /* __UTIL_MATH_INT3_H__ */ -- cgit v1.2.3