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

Fixed build

Browse source
This commit is contained in:
Christophe Riccio 2018-06-01 23:32:57 +02:00
parent a772bb3fd1
commit 2a332ac098
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
glm/gtc/bitfield.inl
View file

@ -587,9 +587,9 @@ namespace detail
return detail::bitfieldInterleave<uint8, uint32>(x, y, z, w);
}
GLM_FUNC_QUALIFIER uint64 bitfieldInterleave(u8vec4 const& v)
GLM_FUNC_QUALIFIER uint32 bitfieldInterleave(u8vec4 const& v)
{
return detail::bitfieldInterleave<uint32, uint64>(v.x, v.y, v.z, v.w);
return detail::bitfieldInterleave<uint8, uint32>(v.x, v.y, v.z, v.w);
}
GLM_FUNC_QUALIFIER int64 bitfieldInterleave(int16 x, int16 y, int16 z, int16 w)