diff options
Diffstat (limited to 'intern/cycles/util/util_types_float4.h')
-rw-r--r-- | intern/cycles/util/util_types_float4.h | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/intern/cycles/util/util_types_float4.h b/intern/cycles/util/util_types_float4.h index 5c10d483c2e..c29e6e15bc3 100644 --- a/intern/cycles/util/util_types_float4.h +++ b/intern/cycles/util/util_types_float4.h @@ -26,35 +26,38 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_GPU__ struct int4; -struct ccl_try_align(16) float4 { -#ifdef __KERNEL_SSE__ - union { - __m128 m128; - struct { float x, y, z, w; }; - }; - - __forceinline float4(); - __forceinline explicit float4(const __m128& a); - - __forceinline operator const __m128&() const; - __forceinline operator __m128&(); - - __forceinline float4& operator =(const float4& 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) float4 +{ +# ifdef __KERNEL_SSE__ + union { + __m128 m128; + struct { + float x, y, z, w; + }; + }; + + __forceinline float4(); + __forceinline explicit float4(const __m128 &a); + + __forceinline operator const __m128 &() const; + __forceinline operator __m128 &(); + + __forceinline float4 &operator=(const float4 &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 float4 make_float4(float f); ccl_device_inline float4 make_float4(float x, float y, float z, float w); -ccl_device_inline float4 make_float4(const int4& i); -ccl_device_inline void print_float4(const char *label, const float4& a); -#endif /* __KERNEL_GPU__ */ +ccl_device_inline float4 make_float4(const int4 &i); +ccl_device_inline void print_float4(const char *label, const float4 &a); +#endif /* __KERNEL_GPU__ */ CCL_NAMESPACE_END -#endif /* __UTIL_TYPES_FLOAT4_H__ */ +#endif /* __UTIL_TYPES_FLOAT4_H__ */ |