mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-30 11:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix fvec4SIMD and fmat4x4SIMD compilation errors.

Browse Source
This commit is contained in:
Dave Reid 2013-04-23 09:19:57 +10:00
parent 30dca2d0c7
commit 5519b86003
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtx/simd_mat4.hpp
View File

@ -90,7 +90,7 @@ namespace detail
fvec4SIMD const & v2, fvec4SIMD const & v2,
fvec4SIMD const & v3); fvec4SIMD const & v3);
explicit fmat4x4SIMD( explicit fmat4x4SIMD(
tmat4x4<float> const & m); mat4x4 const & m);
explicit fmat4x4SIMD( explicit fmat4x4SIMD(
__m128 const in[4]); __m128 const in[4]);
@ -163,7 +163,7 @@ namespace detail
//! Convert a simdMat4 to a mat4. //! Convert a simdMat4 to a mat4.
//! (From GLM_GTX_simd_mat4 extension) //! (From GLM_GTX_simd_mat4 extension)
detail::tmat4x4<float> mat4_cast( mat4 mat4_cast(
detail::fmat4x4SIMD const & x); detail::fmat4x4SIMD const & x);
//! Multiply matrix x by matrix y component-wise, i.e., //! Multiply matrix x by matrix y component-wise, i.e.,

6
glm/gtx/simd_mat4.inl
View File

@ -73,7 +73,7 @@ GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
( (
tmat4x4<float> const & m mat4 const & m
) )
{ {
this->Data[0] = fvec4SIMD(m[0]); this->Data[0] = fvec4SIMD(m[0]);
@ -520,12 +520,12 @@ GLM_FUNC_QUALIFIER fmat4x4SIMD const operator++
}//namespace detail }//namespace detail
GLM_FUNC_QUALIFIER detail::tmat4x4<float> mat4_cast GLM_FUNC_QUALIFIER mat4 mat4_cast
( (
detail::fmat4x4SIMD const & x detail::fmat4x4SIMD const & x
) )
{ {
GLM_ALIGN(16) detail::tmat4x4<float> Result; GLM_ALIGN(16) mat4 Result;
_mm_store_ps(&Result[0][0], x.Data[0].Data); _mm_store_ps(&Result[0][0], x.Data[0].Data);
_mm_store_ps(&Result[1][0], x.Data[1].Data); _mm_store_ps(&Result[1][0], x.Data[1].Data);
_mm_store_ps(&Result[2][0], x.Data[2].Data); _mm_store_ps(&Result[2][0], x.Data[2].Data);

6
glm/gtx/simd_vec4.hpp
View File

@ -76,7 +76,7 @@ namespace detail
static size_type value_size(); static size_type value_size();
typedef fvec4SIMD type; typedef fvec4SIMD type;
typedef tvec4<bool> bool_type; typedef tvec4<bool, highp> bool_type;
#ifdef GLM_SIMD_ENABLE_XYZW_UNION #ifdef GLM_SIMD_ENABLE_XYZW_UNION
union union
@ -108,7 +108,7 @@ namespace detail
float const & z, float const & z,
float const & w); float const & w);
explicit fvec4SIMD( explicit fvec4SIMD(
tvec4<float> const & v); vec4 const & v);
//////////////////////////////////////// ////////////////////////////////////////
//// Convertion vector constructors //// Convertion vector constructors
@ -161,7 +161,7 @@ namespace detail
//! Convert a simdVec4 to a vec4. //! Convert a simdVec4 to a vec4.
//! (From GLM_GTX_simd_vec4 extension) //! (From GLM_GTX_simd_vec4 extension)
detail::tvec4<float> vec4_cast( vec4 vec4_cast(
detail::fvec4SIMD const & x); detail::fvec4SIMD const & x);
//! Returns x if x >= 0; otherwise, it returns -x. //! Returns x if x >= 0; otherwise, it returns -x.

6
glm/gtx/simd_vec4.inl
View File

@ -33,7 +33,7 @@ GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(fvec4SIMD const & v) :
Data(v.Data) Data(v.Data)
{} {}
GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(tvec4<float> const & v) : GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec4 const & v) :
Data(_mm_set_ps(v.w, v.z, v.y, v.x)) Data(_mm_set_ps(v.w, v.z, v.y, v.x))
{} {}
@ -269,12 +269,12 @@ GLM_FUNC_QUALIFIER fvec4SIMD operator-- (fvec4SIMD const & v, int)
}//namespace detail }//namespace detail
GLM_FUNC_QUALIFIER detail::tvec4<float> vec4_cast GLM_FUNC_QUALIFIER vec4 vec4_cast
( (
detail::fvec4SIMD const & x detail::fvec4SIMD const & x
) )
{ {
GLM_ALIGN(16) detail::tvec4<float> Result; GLM_ALIGN(16) vec4 Result;
_mm_store_ps(&Result[0], x.Data); _mm_store_ps(&Result[0], x.Data);
return Result; return Result;
} }