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

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio 2011-09-29 16:58:31 +01:00
commit 5fa3eb9e69
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/func_packing.inl
View File

@ -144,7 +144,7 @@ GLM_FUNC_QUALIFIER detail::tvec2<uint> unpackDouble2x32(double const & v)
return *(detail::tvec2<uint>*)&v; return *(detail::tvec2<uint>*)&v;
} }
GLM_FUNC_QUALIFIER uint packHalf2x16(vec2 const & v) GLM_FUNC_QUALIFIER uint packHalf2x16(detail::tvec2<float> const & v)
{ {
detail::tvec2<detail::hdata> Pack(detail::toFloat16(v.x), detail::toFloat16(v.y)); detail::tvec2<detail::hdata> Pack(detail::toFloat16(v.x), detail::toFloat16(v.y));
return *(uint*)&Pack; return *(uint*)&Pack;

22
glm/core/intrinsic_common.inl
View File

@ -224,11 +224,13 @@ GLM_FUNC_QUALIFIER __m128 sse_mod_ps(__m128 x, __m128 y)
} }
/// TODO /// TODO
/*
GLM_FUNC_QUALIFIER __m128 sse_modf_ps(__m128 x, __m128i & i) GLM_FUNC_QUALIFIER __m128 sse_modf_ps(__m128 x, __m128i & i)
{ {
__m128 empty; __m128 empty;
return empty; return empty;
} }
*/
//GLM_FUNC_QUALIFIER __m128 _mm_min_ps(__m128 x, __m128 y) //GLM_FUNC_QUALIFIER __m128 _mm_min_ps(__m128 x, __m128 y)
@ -273,18 +275,18 @@ GLM_FUNC_QUALIFIER __m128 sse_ssp_ps(__m128 edge0, __m128 edge1, __m128 x)
} }
/// \todo /// \todo
GLM_FUNC_QUALIFIER __m128 sse_nan_ps(__m128 x) //GLM_FUNC_QUALIFIER __m128 sse_nan_ps(__m128 x)
{ //{
__m128 empty; // __m128 empty;
return empty; // return empty;
} //}
/// \todo /// \todo
GLM_FUNC_QUALIFIER __m128 sse_inf_ps(__m128 x) //GLM_FUNC_QUALIFIER __m128 sse_inf_ps(__m128 x)
{ //{
__m128 empty; // __m128 empty;
return empty; // return empty;
} //}
// SSE scalar reciprocal sqrt using rsqrt op, plus one Newton-Rhaphson iteration // SSE scalar reciprocal sqrt using rsqrt op, plus one Newton-Rhaphson iteration
// By Elan Ruskin, http://assemblyrequired.crashworks.org/ // By Elan Ruskin, http://assemblyrequired.crashworks.org/

4
glm/gtx/ulp.inl
View File

@ -76,8 +76,8 @@ namespace detail
volatile float t; volatile float t;
glm::detail::int32 hx, hy, ix, iy; glm::detail::int32 hx, hy, ix, iy;
GLM_GET_FLOAT_WORD(hx,x); GLM_GET_FLOAT_WORD(hx, x);
GLM_GET_FLOAT_WORD(hy,y); GLM_GET_FLOAT_WORD(hy, y);
ix = hx&0x7fffffff; // |x| ix = hx&0x7fffffff; // |x|
iy = hy&0x7fffffff; // |y| iy = hy&0x7fffffff; // |y|