mewin/glm
1
0
Fork 0
Code Releases Activity

Updated compiler message tests

Browse Source
This commit is contained in:
Christophe Riccio
2011-09-16 00:18:12 +01:00
parent 4ac1d9c5cf
commit 20816a9f94
3 changed files with 126 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/core/func_packing.inl
View File

@@ -71,7 +71,7 @@ GLM_FUNC_QUALIFIER detail::tvec2<detail::float32> unpackSnorm2x16(detail::uint32
detail::uint32 Mask16((1 << 16) - 1);
A.u = detail::uint16((p >> 0) & Mask16);
B.u = detail::uint16((p >> 16) & Mask16);
vec2 Pack(A.i, B.i);
detail::tvec2<detail::float32> Pack(A.i, B.i);
return clamp(Pack * 1.0f / 32767.0f, -1.0f, 1.0f);
}
@@ -129,7 +129,7 @@ GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackSnorm4x8(detail::uint32
B.u = detail::uint8((p >> 8) & Mask8);
C.u = detail::uint8((p >> 16) & Mask8);
D.u = detail::uint8((p >> 24) & Mask8);
vec4 Pack(A.i, B.i, C.i, D.i);
detail::tvec4<detail::float32> Pack(A.i, B.i, C.i, D.i);
return clamp(Pack * 1.0f / 127.0f, -1.0f, 1.0f);
}

8
glm/core/setup.hpp
View File

@@ -281,7 +281,13 @@
#else
# define GLM_MODEL GLM_MODEL_32
#endif//
/*
#if(sizeof(void*) == 8)
# define GLM_MODEL GLM_MODEL_64
#else
# define GLM_MODEL GLM_MODEL_32
#endif//_M_X64
*/
#if(!defined(GLM_MODEL) && GLM_COMPILER != 0)
#error "GLM_MODEL undefined, your compiler may not be supported by GLM. Add #define GLM_MODEL 0 to ignore this message."
#endif//GLM_MODEL