diff --git a/glm/core/func_packing.inl b/glm/core/func_packing.inl index f30f9844..4b8c6bcd 100644 --- a/glm/core/func_packing.inl +++ b/glm/core/func_packing.inl @@ -144,7 +144,7 @@ GLM_FUNC_QUALIFIER detail::tvec2 unpackDouble2x32(double const & v) return *(detail::tvec2*)&v; } -GLM_FUNC_QUALIFIER uint packHalf2x16(vec2 const & v) +GLM_FUNC_QUALIFIER uint packHalf2x16(detail::tvec2 const & v) { detail::tvec2 Pack(detail::toFloat16(v.x), detail::toFloat16(v.y)); return *(uint*)&Pack; diff --git a/glm/core/intrinsic_common.inl b/glm/core/intrinsic_common.inl index 563376b6..4b76d4d8 100644 --- a/glm/core/intrinsic_common.inl +++ b/glm/core/intrinsic_common.inl @@ -224,11 +224,13 @@ GLM_FUNC_QUALIFIER __m128 sse_mod_ps(__m128 x, __m128 y) } /// TODO +/* GLM_FUNC_QUALIFIER __m128 sse_modf_ps(__m128 x, __m128i & i) { __m128 empty; return empty; } +*/ //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 -GLM_FUNC_QUALIFIER __m128 sse_nan_ps(__m128 x) -{ - __m128 empty; - return empty; -} +//GLM_FUNC_QUALIFIER __m128 sse_nan_ps(__m128 x) +//{ +// __m128 empty; +// return empty; +//} /// \todo -GLM_FUNC_QUALIFIER __m128 sse_inf_ps(__m128 x) -{ - __m128 empty; - return empty; -} +//GLM_FUNC_QUALIFIER __m128 sse_inf_ps(__m128 x) +//{ +// __m128 empty; +// return empty; +//} // SSE scalar reciprocal sqrt using rsqrt op, plus one Newton-Rhaphson iteration // By Elan Ruskin, http://assemblyrequired.crashworks.org/ diff --git a/glm/gtx/ulp.inl b/glm/gtx/ulp.inl index 1a85b5c4..a2ac95d4 100644 --- a/glm/gtx/ulp.inl +++ b/glm/gtx/ulp.inl @@ -76,8 +76,8 @@ namespace detail volatile float t; glm::detail::int32 hx, hy, ix, iy; - GLM_GET_FLOAT_WORD(hx,x); - GLM_GET_FLOAT_WORD(hy,y); + GLM_GET_FLOAT_WORD(hx, x); + GLM_GET_FLOAT_WORD(hy, y); ix = hx&0x7fffffff; // |x| iy = hy&0x7fffffff; // |y|