mewin/glm
1
0
Fork 0
Code Releases Activity

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
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); 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) GLM_FUNC_QUALIFIER int64 bitfieldInterleave(int16 x, int16 y, int16 z, int16 w)