mewin/glm
1
0
Fork 0
Code Releases Activity

Renamed comp (X|Y|Z|W) template parameters in fvec4SIMD to (X|Y|Z|W)_

Browse Source
This commit is contained in:
Jesse Talavera-Greenberg 2015-10-07 16:11:23 -04:00
parent 5eb7ad5d47
commit 08bf6e78c9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glm/gtx/simd_vec4.hpp
View File

@ -186,15 +186,15 @@ namespace detail
////////////////////////////////////// //////////////////////////////////////
// Swizzle operators // Swizzle operators
template <comp X, comp Y, comp Z, comp W> template <comp X_, comp Y_, comp Z_, comp W_>
fvec4SIMD& swizzle(); fvec4SIMD& swizzle();
template <comp X, comp Y, comp Z, comp W> template <comp X_, comp Y_, comp Z_, comp W_>
fvec4SIMD swizzle() const; fvec4SIMD swizzle() const;
template <comp X, comp Y, comp Z> template <comp X_, comp Y_, comp Z_>
fvec4SIMD swizzle() const; fvec4SIMD swizzle() const;
template <comp X, comp Y> template <comp X_, comp Y_>
fvec4SIMD swizzle() const; fvec4SIMD swizzle() const;
template <comp X> template <comp X_>
fvec4SIMD swizzle() const; fvec4SIMD swizzle() const;
}; };
}//namespace detail }//namespace detail

8
glm/gtx/simd_vec4.inl
View File

@ -186,21 +186,21 @@ GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator--()
////////////////////////////////////// //////////////////////////////////////
// Swizzle operators // Swizzle operators
template <comp X, comp Y, comp Z, comp W> template <comp X_, comp Y_, comp Z_, comp W_>
GLM_FUNC_QUALIFIER fvec4SIMD fvec4SIMD::swizzle() const GLM_FUNC_QUALIFIER fvec4SIMD fvec4SIMD::swizzle() const
{ {
__m128 Data = _mm_shuffle_ps( __m128 Data = _mm_shuffle_ps(
this->Data, this->Data, this->Data, this->Data,
shuffle_mask<(W << 6) | (Z << 4) | (Y << 2) | (X << 0)>::value); shuffle_mask<(W_ << 6) | (Z_ << 4) | (Y_ << 2) | (X_ << 0)>::value);
return fvec4SIMD(Data); return fvec4SIMD(Data);
} }
template <comp X, comp Y, comp Z, comp W> template <comp X_, comp Y_, comp Z_, comp W_>
GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::swizzle() GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::swizzle()
{ {
this->Data = _mm_shuffle_ps( this->Data = _mm_shuffle_ps(
this->Data, this->Data, this->Data, this->Data,
shuffle_mask<(W << 6) | (Z << 4) | (Y << 2) | (X << 0)>::value); shuffle_mask<(W_ << 6) | (Z_ << 4) | (Y_ << 2) | (X_ << 0)>::value);
return *this; return *this;
} }