mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed scalar uaddCarry build error with Cuda #276

Browse Source
This commit is contained in:
Christophe Riccio
2014-12-01 20:27:56 +01:00
parent f680d14612
commit 28aba540ee
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glm/detail/func_integer.inl
View File

@@ -203,7 +203,7 @@ namespace detail
GLM_FUNC_QUALIFIER uint uaddCarry(uint const & x, uint const & y, uint & Carry)
{
uint64 const Value64(static_cast<uint64>(x) + static_cast<uint64>(y));
uint64 const Max32(static_cast<uint64>(std::numeric_limits<uint>::max()));
uint64 const Max32((static_cast<uint64>(1) << static_cast<uint64>(32)) - static_cast<uint64>(1));
Carry = Value64 > Max32 ? 1 : 0;
return static_cast<uint32>(Value64 % (Max32 + static_cast<uint64>(1)));
}