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

Fixed warnings in F2x11_1x10 packing function in GTC_packing #295

Browse Source
This commit is contained in:
Christophe Riccio 2015-01-08 23:50:06 +01:00
parent 97adb6e498
commit ed3d8e17e4
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glm/gtc/packing.inl
View File

@ -144,14 +144,14 @@ namespace detail
GLM_FUNC_QUALIFIER glm::uint floatTo11bit(float x) GLM_FUNC_QUALIFIER glm::uint floatTo11bit(float x)
{ {
if(x == 0.0f) if(x == 0.0f)
return 0; return 0u;
else if(glm::isnan(x)) else if(glm::isnan(x))
return ~0; return ~0u;
else if(glm::isinf(x)) else if(glm::isinf(x))
return 0x1f << 6; return 0x1Fu << 6u;
# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) # if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM))
uint Pack = 0; uint Pack = 0u;
memcpy(&Pack, &x, sizeof(Pack)); memcpy(&Pack, &x, sizeof(Pack));
# else # else
uint Pack = reinterpret_cast<uint&>(x); uint Pack = reinterpret_cast<uint&>(x);
@ -183,11 +183,11 @@ namespace detail
GLM_FUNC_QUALIFIER glm::uint floatTo10bit(float x) GLM_FUNC_QUALIFIER glm::uint floatTo10bit(float x)
{ {
if(x == 0.0f) if(x == 0.0f)
return 0; return 0u;
else if(glm::isnan(x)) else if(glm::isnan(x))
return ~0; return ~0u;
else if(glm::isinf(x)) else if(glm::isinf(x))
return 0x1f << 5; return 0x1Fu << 5u;
# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM)) # if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & (GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_LLVM))
uint Pack = 0; uint Pack = 0;

1
readme.txt
View File

@ -76,6 +76,7 @@ Fixes:
- Fixed faceforward build #289 - Fixed faceforward build #289
- Fixed decompose function VS2010 templating issues #294 - Fixed decompose function VS2010 templating issues #294
- Fixed mat4x3 = mat2x3 * mat4x2 operator #297 - Fixed mat4x3 = mat2x3 * mat4x2 operator #297
- Fixed warnings in F2x11_1x10 pcking function in GTC_packing #295
================================================================================ ================================================================================
GLM 0.9.6.1: 2014-12-10 GLM 0.9.6.1: 2014-12-10