mewin/glm
1
0
Fork 0
Code Releases Activity

usubBorrow and uaddCarry are better implemented as template specialization

Browse Source
This commit is contained in:
Christophe Riccio
2013-10-10 01:14:39 +02:00
parent d4046da22e
commit 66bc06771c
2 changed files with 53 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
glm/core/func_integer.inl
View File

@@ -42,64 +42,56 @@
namespace glm namespace glm
{ {
// uaddCarry // uaddCarry
template <typename genUType> template <>
GLM_FUNC_QUALIFIER genUType uaddCarry GLM_FUNC_QUALIFIER uint uaddCarry
( (
genUType const & x, uint const & x,
genUType const & y, uint const & y,
genUType & Carry uint & Carry
) )
{ {
GLM_STATIC_ASSERT(std::numeric_limits<genUType>::is_integer && !std::numeric_limits<genUType>::is_signed, "'uaddCarry' only accept unsigned integer inputs");
uint64 Value64 = static_cast<uint64>(x) + static_cast<uint64>(y); uint64 Value64 = static_cast<uint64>(x) + static_cast<uint64>(y);
genUType Result = genUType(Value64 % (static_cast<uint64>(1) << static_cast<uint64>(32))); uint32 Result = static_cast<uint32>(Value64 % (static_cast<uint64>(1) << static_cast<uint64>(32)));
Carry = (Value64 % (static_cast<uint64>(1) << static_cast<uint64>(32))) > 1 ? static_cast<genUType>(1) : static_cast<genUType>(0); Carry = (Value64 % (static_cast<uint64>(1) << static_cast<uint64>(32))) > 1 ? static_cast<uint32>(1) : static_cast<uint32>(0);
return Result; return Result;
} }
template <typename T, precision P> template <>
GLM_FUNC_QUALIFIER detail::tvec2<T, P> uaddCarry GLM_FUNC_QUALIFIER uvec2 uaddCarry
( (
detail::tvec2<T, P> const & x, uvec2 const & x,
detail::tvec2<T, P> const & y, uvec2 const & y,
detail::tvec2<T, P> & Carry uvec2 & Carry
) )
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer && !std::numeric_limits<T>::is_signed, "'uaddCarry' only accept unsigned integer inputs"); return uvec2(
return detail::tvec2<T, P>(
uaddCarry(x[0], y[0], Carry[0]), uaddCarry(x[0], y[0], Carry[0]),
uaddCarry(x[1], y[1], Carry[1])); uaddCarry(x[1], y[1], Carry[1]));
} }
template <typename T, precision P> template <>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> uaddCarry GLM_FUNC_QUALIFIER uvec3 uaddCarry
( (
detail::tvec3<T, P> const & x, uvec3 const & x,
detail::tvec3<T, P> const & y, uvec3 const & y,
detail::tvec3<T, P> & Carry uvec3 & Carry
) )
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer && !std::numeric_limits<T>::is_signed, "'uaddCarry' only accept unsigned integer inputs"); return uvec3(
return detail::tvec3<T, P>(
uaddCarry(x[0], y[0], Carry[0]), uaddCarry(x[0], y[0], Carry[0]),
uaddCarry(x[1], y[1], Carry[1]), uaddCarry(x[1], y[1], Carry[1]),
uaddCarry(x[2], y[2], Carry[2])); uaddCarry(x[2], y[2], Carry[2]));
} }
template <typename T, precision P> template <>
GLM_FUNC_QUALIFIER detail::tvec4<T, P> uaddCarry GLM_FUNC_QUALIFIER uvec4 uaddCarry
( (
detail::tvec4<T, P> const & x, uvec4 const & x,
detail::tvec4<T, P> const & y, uvec4 const & y,
detail::tvec4<T, P> & Carry uvec4 & Carry
) )
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer && !std::numeric_limits<T>::is_signed, "'uaddCarry' only accept unsigned integer inputs"); return uvec4(
return detail::tvec4<T, P>(
uaddCarry(x[0], y[0], Carry[0]), uaddCarry(x[0], y[0], Carry[0]),
uaddCarry(x[1], y[1], Carry[1]), uaddCarry(x[1], y[1], Carry[1]),
uaddCarry(x[2], y[2], Carry[2]), uaddCarry(x[2], y[2], Carry[2]),
@@ -107,65 +99,59 @@ namespace glm
} }
// usubBorrow // usubBorrow
template <typename genUType> template <>
GLM_FUNC_QUALIFIER genUType usubBorrow GLM_FUNC_QUALIFIER uint usubBorrow
( (
genUType const & x, uint const & x,
genUType const & y, uint const & y,
genUType & Borrow uint & Borrow
) )
{ {
GLM_STATIC_ASSERT(std::numeric_limits<genUType>::is_integer && !std::numeric_limits<genUType>::is_signed, "'usubBorrow' only accept unsigned integer inputs"); GLM_STATIC_ASSERT(sizeof(uint) == sizeof(uint32), "uint and uint32 size mismatch");
Borrow = x >= y ? static_cast<genUType>(0) : static_cast<genUType>(1); Borrow = x >= y ? static_cast<uint32>(0) : static_cast<uint32>(1);
if(x > y) if(x > y)
return static_cast<genUType>(static_cast<int64>(x) -static_cast<int64>(y)); return static_cast<uint32>(static_cast<int64>(x) -static_cast<int64>(y));
else else
return static_cast<genUType>((static_cast<int64>(1) << static_cast<int64>(32)) + static_cast<int64>(x) - static_cast<int64>(y)); return static_cast<uint32>((static_cast<int64>(1) << static_cast<int64>(32)) + static_cast<int64>(x) - static_cast<int64>(y));
} }
template <typename T, precision P> template <>
GLM_FUNC_QUALIFIER detail::tvec2<T, P> usubBorrow GLM_FUNC_QUALIFIER uvec2 usubBorrow
( (
detail::tvec2<T, P> const & x, uvec2 const & x,
detail::tvec2<T, P> const & y, uvec2 const & y,
detail::tvec2<T, P> & Borrow uvec2 & Borrow
) )
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer && !std::numeric_limits<T>::is_signed, "'usubBorrow' only accept unsigned integer inputs"); return uvec2(
return detail::tvec2<T, P>(
usubBorrow(x[0], y[0], Borrow[0]), usubBorrow(x[0], y[0], Borrow[0]),
usubBorrow(x[1], y[1], Borrow[1])); usubBorrow(x[1], y[1], Borrow[1]));
} }
template <typename T, precision P> template <>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> usubBorrow GLM_FUNC_QUALIFIER uvec3 usubBorrow
( (
detail::tvec3<T, P> const & x, uvec3 const & x,
detail::tvec3<T, P> const & y, uvec3 const & y,
detail::tvec3<T, P> & Borrow uvec3 & Borrow
) )
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer && !std::numeric_limits<T>::is_signed, "'usubBorrow' only accept unsigned integer inputs"); return uvec3(
return detail::tvec3<T, P>(
usubBorrow(x[0], y[0], Borrow[0]), usubBorrow(x[0], y[0], Borrow[0]),
usubBorrow(x[1], y[1], Borrow[1]), usubBorrow(x[1], y[1], Borrow[1]),
usubBorrow(x[2], y[2], Borrow[2])); usubBorrow(x[2], y[2], Borrow[2]));
} }
template <typename T, precision P> template <>
GLM_FUNC_QUALIFIER detail::tvec4<T, P> usubBorrow GLM_FUNC_QUALIFIER uvec4 usubBorrow
( (
detail::tvec4<T, P> const & x, uvec4 const & x,
detail::tvec4<T, P> const & y, uvec4 const & y,
detail::tvec4<T, P> & Borrow uvec4 & Borrow
) )
{ {
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer && !std::numeric_limits<T>::is_signed, "'usubBorrow' only accept unsigned integer inputs"); return uvec4(
return detail::tvec4<T, P>(
usubBorrow(x[0], y[0], Borrow[0]), usubBorrow(x[0], y[0], Borrow[0]),
usubBorrow(x[1], y[1], Borrow[1]), usubBorrow(x[1], y[1], Borrow[1]),
usubBorrow(x[2], y[2], Borrow[2]), usubBorrow(x[2], y[2], Borrow[2]),

2
readme.txt
View File

@@ -65,7 +65,7 @@ GLM 0.9.5.0: 2013-XX-XX
- Replaced GLM traits by STL traits when possible - Replaced GLM traits by STL traits when possible
- Allowed including individual core feature - Allowed including individual core feature
- Increased unit tests completness - Increased unit tests completness
- Added creating of a quaternion from two vectors - Added creating of a quaternion from two vectors
- Added C++11 initializer lists - Added C++11 initializer lists
- Fixed umulExtended and imulExtended implementations for vector types (#76) - Fixed umulExtended and imulExtended implementations for vector types (#76)