mewin/glm
1
0
Fork 0
Code Releases Activity

Updated SSE setup

Browse Source
This commit is contained in:
Christophe Riccio 2011-01-10 20:10:35 +00:00
parent 9bfef421e2
commit d7755485c8
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glm/core/intrinsic_common.hpp
View File

@ -12,11 +12,10 @@
#include "../setup.hpp" #include "../setup.hpp"
#if(GLM_ARCH != GLM_ARCH_PURE) #if(GLM_ARCH >= GLM_ARCH_SSE2)
namespace glm{ namespace glm{
namespace detail namespace detail{
{
__m128 sse_abs_ps(__m128 x); __m128 sse_abs_ps(__m128 x);
__m128 sse_sgn_ps(__m128 x); __m128 sse_sgn_ps(__m128 x);
@ -62,5 +61,5 @@ namespace detail
#include "intrinsic_common.inl" #include "intrinsic_common.inl"
#endif//(GLM_ARCH != GLM_ARCH_PURE) #endif//(GLM_ARCH >= GLM_ARCH_SSE2)
#endif//glm_detail_intrinsic_common #endif//glm_detail_intrinsic_common

4
glm/gtx/simd_vec4.hpp
View File

@ -110,6 +110,10 @@ namespace glm
{ {
typedef detail::fvec4SIMD simd_vec4; typedef detail::fvec4SIMD simd_vec4;
detail::fvec4SIMD cross(
detail::fvec4SIMD const & a,
detail::fvec4SIMD const & b);
}//namespace simd_vec4 }//namespace simd_vec4
}//namespace gtx }//namespace gtx
}//namespace glm }//namespace glm

21
glm/gtx/simd_vec4.inl
View File

@ -266,8 +266,25 @@ namespace glm
namespace gtx{ namespace gtx{
namespace simd_vec4 namespace simd_vec4
{ {
# if(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_SSE)
inline detail::fvec4SIMD cross
(
detail::fvec4SIMD const & a,
detail::fvec4SIMD const & b
)
{
return _mm_xpd_ps(a.Data, b.Data);
}
# else//(GLM_INSTRUCTION_SET & GLM_INSTRUCTION_SET_PURE)
inline detail::fvec4SIMD cross
(
detail::fvec4SIMD const & a,
detail::fvec4SIMD const & b
)
{
return glm::cross(a, b);
}
# endif
}//namespace simd_vec4 }//namespace simd_vec4
}//namespace gtx }//namespace gtx
}//namespace glm }//namespace glm

14
glm/setup.hpp
View File

@ -241,10 +241,18 @@
#if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_GCC)) #if(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_GCC))
# define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_NULL # define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_NULL
#elif(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC)) #elif(defined(GLM_COMPILER) && (GLM_COMPILER & GLM_COMPILER_VC))
# ifdef _M_CEE_PURE # if(GLM_MODEL == GLM_MODEL_64)
# define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_PURE # ifdef _M_CEE_PURE
# define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_PURE
# else
# define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_MMX | GLM_INSTRUCTION_SET_SSE
# endif
# else # else
# define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_NULL # ifdef _M_CEE_PURE
# define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_PURE
# else
# define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_NULL
# endif
# endif # endif
#else #else
# define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_PURE # define GLM_INSTRUCTION_SET GLM_INSTRUCTION_SET_PURE