diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-29 18:05:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-29 18:05:13 +0300 |
| commit | 76a9752be21a593387900e3885472de988a5a5c0 (patch) | |
| tree | 9dcd328b7ad42064f9ad3e4c9b7b669c9a218317 /intern/cycles/util | |
| parent | ddf8c49736864fe89348c002fecaacdcb1c28c8e (diff) | |
Cleanup: trailing space
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_avxb.h | 11 | ||||
| -rw-r--r-- | intern/cycles/util/util_avxf.h | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/intern/cycles/util/util_avxb.h b/intern/cycles/util/util_avxb.h index 865549be283..60d9bb44256 100644 --- a/intern/cycles/util/util_avxb.h +++ b/intern/cycles/util/util_avxb.h @@ -34,7 +34,7 @@ struct avxb //////////////////////////////////////////////////////////////////////////////// /// Constructors, Assignment & Cast Operators //////////////////////////////////////////////////////////////////////////////// - + __forceinline avxb ( ) {} __forceinline avxb ( const avxb& other ) { m256 = other.m256; } __forceinline avxb& operator=( const avxb& other ) { m256 = other.m256; return *this; } @@ -43,10 +43,10 @@ struct avxb __forceinline operator const __m256&( void ) const { return m256; } __forceinline operator const __m256i( void ) const { return _mm256_castps_si256(m256); } __forceinline operator const __m256d( void ) const { return _mm256_castps_pd(m256); } - + //__forceinline avxb ( bool a ) // : m256(_mm_lookupmask_ps[(size_t(a) << 3) | (size_t(a) << 2) | (size_t(a) << 1) | size_t(a)]) {} - //__forceinline avxb ( bool a, bool b) + //__forceinline avxb ( bool a, bool b) // : m256(_mm_lookupmask_ps[(size_t(b) << 3) | (size_t(a) << 2) | (size_t(b) << 1) | size_t(a)]) {} //__forceinline avxb ( bool a, bool b, bool c, bool d) // : m256(_mm_lookupmask_ps[(size_t(d) << 3) | (size_t(c) << 2) | (size_t(b) << 1) | size_t(a)]) {} @@ -101,9 +101,9 @@ __forceinline const avxb operator ==( const avxb& a, const avxb& b ) { return _m __forceinline const avxb select( const avxb& m, const avxb& t, const avxb& f ) { #if defined(__KERNEL_SSE41__) - return _mm256_blendv_ps(f, t, m); + return _mm256_blendv_ps(f, t, m); #else - return _mm256_or_ps(_mm256_and_ps(m, t), _mm256_andnot_ps(m, f)); + return _mm256_or_ps(_mm256_and_ps(m, t), _mm256_andnot_ps(m, f)); #endif } @@ -189,4 +189,3 @@ ccl_device_inline void print_avxb(const char *label, const avxb &a) CCL_NAMESPACE_END //#endif - diff --git a/intern/cycles/util/util_avxf.h b/intern/cycles/util/util_avxf.h index 81365f96c94..5596702ca20 100644 --- a/intern/cycles/util/util_avxf.h +++ b/intern/cycles/util/util_avxf.h @@ -237,4 +237,3 @@ __forceinline const avxb operator <=(const avxf& a, const avxf& b) { _mm256_set_m128(_mm_loadu_ps(hiaddr), _mm_loadu_ps(loaddr)) CCL_NAMESPACE_END - |