mewin/glm
1
0
Fork 0
Code Releases 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
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)
{
if(x == 0.0f)
return 0;
return 0u;
else if(glm::isnan(x))
return ~0;
return ~0u;
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))
uint Pack = 0;
uint Pack = 0u;
memcpy(&Pack, &x, sizeof(Pack));
# else
uint Pack = reinterpret_cast<uint&>(x);
@@ -183,11 +183,11 @@ namespace detail
GLM_FUNC_QUALIFIER glm::uint floatTo10bit(float x)
{
if(x == 0.0f)
return 0;
return 0u;
else if(glm::isnan(x))
return ~0;
return ~0u;
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))
uint Pack = 0;