organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-06 22:15:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fixed inline

Browse source
This commit is contained in:
Christophe Riccio 2013-12-15 19:55:13 +01:00
parent dadab89566
commit 0640bcaab0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
glm/core/dummy.cpp
View file

@ -73,7 +73,7 @@ int main()
# if(GLM_ARCH & GLM_ARCH_SSE2)
test_simd();
# endif
*/
*/
C<> c;

10
glm/gtc/packing.inl
View file

@ -167,7 +167,7 @@ namespace detail
return float2packed10(reinterpret_cast<uint&>(x));
}
float packed10bitToFloat(glm::uint x)
GLM_FUNC_QUALIFIER float packed10bitToFloat(glm::uint x)
{
if(x == 0)
return 0.0f;
@ -180,10 +180,10 @@ namespace detail
return reinterpret_cast<float&>(result);
}
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);
}
// GLM_FUNC_QUALIFIER 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);
// }
union u10u10u10u2
{