diff options
Diffstat (limited to 'intern/cycles/util/util_types_float3.h')
-rw-r--r-- | intern/cycles/util/util_types_float3.h | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/intern/cycles/util/util_types_float3.h b/intern/cycles/util/util_types_float3.h index ed2300e7996..694a600bf5c 100644 --- a/intern/cycles/util/util_types_float3.h +++ b/intern/cycles/util/util_types_float3.h @@ -24,34 +24,37 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_GPU__ -struct ccl_try_align(16) float3 { -#ifdef __KERNEL_SSE__ - union { - __m128 m128; - struct { float x, y, z, w; }; - }; - - __forceinline float3(); - __forceinline float3(const float3& a); - __forceinline explicit float3(const __m128& a); - - __forceinline operator const __m128&() const; - __forceinline operator __m128&(); - - __forceinline float3& operator =(const float3& a); -#else /* __KERNEL_SSE__ */ - float x, y, z, w; -#endif /* __KERNEL_SSE__ */ - - __forceinline float operator[](int i) const; - __forceinline float& operator[](int i); +struct ccl_try_align(16) float3 +{ +# ifdef __KERNEL_SSE__ + union { + __m128 m128; + struct { + float x, y, z, w; + }; + }; + + __forceinline float3(); + __forceinline float3(const float3 &a); + __forceinline explicit float3(const __m128 &a); + + __forceinline operator const __m128 &() const; + __forceinline operator __m128 &(); + + __forceinline float3 &operator=(const float3 &a); +# else /* __KERNEL_SSE__ */ + float x, y, z, w; +# endif /* __KERNEL_SSE__ */ + + __forceinline float operator[](int i) const; + __forceinline float &operator[](int i); }; ccl_device_inline float3 make_float3(float f); ccl_device_inline float3 make_float3(float x, float y, float z); -ccl_device_inline void print_float3(const char *label, const float3& a); -#endif /* __KERNEL_GPU__ */ +ccl_device_inline void print_float3(const char *label, const float3 &a); +#endif /* __KERNEL_GPU__ */ CCL_NAMESPACE_END -#endif /* __UTIL_TYPES_FLOAT3_H__ */ +#endif /* __UTIL_TYPES_FLOAT3_H__ */ |