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

Fixed /W4 warnings

Browse Source
This commit is contained in:
Christophe Riccio 2011-09-29 16:49:50 +01:00
parent 64453fd44e
commit 5431212c55
5 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/core/func_packing.inl
View File

@ -128,7 +128,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

@ -205,11 +205,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)
@ -254,18 +256,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/

7
glm/gtc/half_float.inl
View File

@ -20,7 +20,7 @@ GLM_FUNC_QUALIFIER tvec2<thalf>::size_type tvec2<thalf>::value_size()
return 2; return 2;
} }
GLM_FUNC_QUALIFIER typename tvec2<thalf>::size_type tvec2<thalf>::length() const GLM_FUNC_QUALIFIER tvec2<thalf>::size_type tvec2<thalf>::length() const
{ {
return 2; return 2;
} }
@ -293,7 +293,7 @@ GLM_FUNC_QUALIFIER tvec3<thalf>::size_type tvec3<thalf>::value_size()
return 3; return 3;
} }
GLM_FUNC_QUALIFIER typename tvec3<thalf>::size_type tvec3<thalf>::length() const GLM_FUNC_QUALIFIER tvec3<thalf>::size_type tvec3<thalf>::length() const
{ {
return 3; return 3;
} }
@ -610,8 +610,7 @@ GLM_FUNC_QUALIFIER tvec4<thalf>::size_type tvec4<thalf>::value_size()
return 4; return 4;
} }
GLM_FUNC_QUALIFIER tvec4<thalf>::size_type tvec4<thalf>::length() const
GLM_FUNC_QUALIFIER typename tvec4<thalf>::size_type tvec4<thalf>::length() const
{ {
return 4; return 4;
} }

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|

6
test/core/core_type_half.cpp
View File

@ -18,13 +18,13 @@ int main()
glm::half B(2.0f); glm::half B(2.0f);
glm::half C = A + B; glm::half C = A + B;
glm::half D(C); glm::half D(C);
float E = D; float E(D);
int F = float(C); int F(float(C));
glm::half G = B * C; glm::half G = B * C;
glm::half H = G / C; glm::half H = G / C;
H += glm::half(1.0f); H += glm::half(1.0f);
double J = H; double J = H;
int I = float(H); int I(float(H));
Result = Result && J == 3.0; Result = Result && J == 3.0;