mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added unpack 111110 implementation, missing inf and NaN code path

Browse Source
This commit is contained in:
Christophe Riccio 2013-08-26 07:38:34 +02:00
parent 6fd6cf2c8c
commit fb13e7bf8a
1 changed files with 77 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
glm/gtc/packing.inl
View File

@ -47,7 +47,7 @@ namespace detail
((f >> 13) & 0x03ff); // Mantissa ((f >> 13) & 0x03ff); // Mantissa
} }
glm::uint16 float2packed11(glm::uint32 const & f) glm::uint32 float2packed11(glm::uint32 const & f)
{ {
// 10 bits => EE EEEFFFFF // 10 bits => EE EEEFFFFF
// 11 bits => EEE EEFFFFFF // 11 bits => EEE EEFFFFFF
@ -61,11 +61,29 @@ namespace detail
// 0x7f800000 => 01111111 10000000 00000000 00000000 // 0x7f800000 => 01111111 10000000 00000000 00000000
// 0x00008000 => 00000000 00000000 10000000 00000000 // 0x00008000 => 00000000 00000000 10000000 00000000
return return
((((f & 0x7f800000) - 0x38000000) >> 17) & 0x07c0) | // exponential ((((f & 0x7f800000) - 0x38000000) >> 17) & 0x07c0) | // exponential
((f >> 17) & 0x003f); // Mantissa ((f >> 17) & 0x003f); // Mantissa
} }
glm::uint float2packed10(glm::uint const & f) glm::uint32 packed11Tofloat(glm::uint32 const & p)
{
// 10 bits => EE EEEFFFFF
// 11 bits => EEE EEFFFFFF
// Half bits => SEEEEEFF FFFFFFFF
// Float bits => SEEEEEEE EFFFFFFF FFFFFFFF FFFFFFFF
// 0x000007c0 => 00000000 00000000 00000111 11000000
// 0x00007c00 => 00000000 00000000 01111100 00000000
// 0x000003ff => 00000000 00000000 00000011 11111111
// 0x38000000 => 00111000 00000000 00000000 00000000
// 0x7f800000 => 01111111 10000000 00000000 00000000
// 0x00008000 => 00000000 00000000 10000000 00000000
return
((((p & 0x07c0) << 17) + 0x38000000) & 0x7f800000) | // exponential
((f & 0x003f) << 17); // Mantissa
}
glm::uint32 float2packed10(glm::uint32 const & f)
{ {
// 10 bits => EE EEEFFFFF // 10 bits => EE EEEFFFFF
// 11 bits => EEE EEFFFFFF // 11 bits => EEE EEFFFFFF
@ -82,8 +100,29 @@ namespace detail
// 0x7f800000 => 01111111 10000000 00000000 00000000 // 0x7f800000 => 01111111 10000000 00000000 00000000
// 0x00008000 => 00000000 00000000 10000000 00000000 // 0x00008000 => 00000000 00000000 10000000 00000000
return return
((((f & 0x7f800000) - 0x38000000) >> 18) & 0x03E0) | // exponential ((((f & 0x7f800000) - 0x38000000) >> 18) & 0x03E0) | // exponential
((f >> 18) & 0x001f); // Mantissa ((f >> 18) & 0x001f); // Mantissa
}
glm::uint32 packed10ToFloat(glm::uint32 const & p)
{
// 10 bits => EE EEEFFFFF
// 11 bits => EEE EEFFFFFF
// Half bits => SEEEEEFF FFFFFFFF
// Float bits => SEEEEEEE EFFFFFFF FFFFFFFF FFFFFFFF
// 0x0000001F => 00000000 00000000 00000000 00011111
// 0x0000003F => 00000000 00000000 00000000 00111111
// 0x000003E0 => 00000000 00000000 00000011 11100000
// 0x000007C0 => 00000000 00000000 00000111 11000000
// 0x00007C00 => 00000000 00000000 01111100 00000000
// 0x000003FF => 00000000 00000000 00000011 11111111
// 0x38000000 => 00111000 00000000 00000000 00000000
// 0x7f800000 => 01111111 10000000 00000000 00000000
// 0x00008000 => 00000000 00000000 10000000 00000000
return
((((p & 0x03E0) << 18) + 0x38000000) & 0x7f800000) | // exponential
((f & 0x001f) << 18); // Mantissa
} }
glm::uint half2float(glm::uint const & h) glm::uint half2float(glm::uint const & h)
@ -111,6 +150,20 @@ namespace detail
return float2packed11(Union.i); return float2packed11(Union.i);
} }
float packed11bitToFloat(glm::uint x)
{
if(x == 0)
return 0.0f;
else if(x == ((1 << 11) - 1))
return ~0;//NaN
else if(x == (0x1f << 6))
return ~0;//Inf
uif Union;
Union.i = packed11ToFloat(x);
return Union.f;
}
glm::uint floatTo10bit(float x) glm::uint floatTo10bit(float x)
{ {
if(x == 0.0f) if(x == 0.0f)
@ -125,6 +178,20 @@ namespace detail
return float2packed10(Union.i); return float2packed10(Union.i);
} }
float packed10bitToFloat(glm::uint x)
{
if(x == 0)
return 0.0f;
else if(x == ((1 << 10) - 1))
return ~0;//NaN
else if(x == (0x1f << 5))
return ~0;//Inf
uif Union;
Union.i = packed10ToFloat(x);
return Union.f;
}
glm::uint f11_f11_f10(float x, float y, float z) glm::uint f11_f11_f10(float x, float y, float z)
{ {
return ((floatTo11bit(x) & ((1 << 11) - 1)) << 0) | ((floatTo11bit(y) & ((1 << 11) - 1)) << 11) | ((floatTo10bit(z) & ((1 << 10) - 1)) << 22); return ((floatTo11bit(x) & ((1 << 11) - 1)) << 0) | ((floatTo11bit(y) & ((1 << 11) - 1)) << 11) | ((floatTo10bit(z) & ((1 << 10) - 1)) << 22);
@ -224,7 +291,6 @@ namespace detail
}; };
}//namespace detail }//namespace detail
GLM_FUNC_QUALIFIER uint8 packUnorm1x8(float const & v) GLM_FUNC_QUALIFIER uint8 packUnorm1x8(float const & v)
{ {
int8 Scaled(round(clamp(v ,-1.0f, 1.0f) * 255.0f)); int8 Scaled(round(clamp(v ,-1.0f, 1.0f) * 255.0f));
@ -468,9 +534,10 @@ namespace detail
GLM_FUNC_QUALIFIER vec3 unpackF2x11_1x10(uint32 const & v) GLM_FUNC_QUALIFIER vec3 unpackF2x11_1x10(uint32 const & v)
{ {
vec3 Result; return vec3(
// TODO packed11bitToFloat(v >> 0),
return Result; packed11bitToFloat(v >> 11),
packed10bitToFloat(v >> 22));
} }
}//namespace glm }//namespace glm