mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed glm::mask function and tests

Browse Source
This commit is contained in:
Christophe Riccio
2014-11-14 02:01:46 +01:00
parent a604ebdaa5
commit c36f3630eb
4 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
glm/detail/func_integer.inl
View File

@@ -45,9 +45,7 @@ namespace detail
template <typename T>
GLM_FUNC_QUALIFIER T mask(T Bits)
{
GLM_STATIC_ASSERT(!std::numeric_limits<T>::is_signed, "'Bits' type must be unsigned");
return ~((~static_cast<T>(0)) << Bits);
return Bits >= sizeof(T) * 8 ? ~static_cast<T>(0) : (static_cast<T>(1) << Bits) - static_cast<T>(1);
}
template <bool EXEC = false>
@@ -189,8 +187,7 @@ namespace detail
{
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldExtract' only accept integer inputs");
T const Mask = static_cast<T>(detail::mask(detail::make_unsigned<T>::type(Bits)));
return (Value >> static_cast<T>(Offset)) & static_cast<T>(Mask);
return (Value >> static_cast<T>(Offset)) & static_cast<T>(detail::mask(Bits));
}
// bitfieldInsert
@@ -205,7 +202,7 @@ namespace detail
{
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'bitfieldInsert' only accept integer values");
T Mask = static_cast<T>(detail::mask(detail::make_unsigned<T>::type(Bits)) << Offset);
T const Mask = static_cast<T>(detail::mask(Bits) << Offset);
return (Base & ~Mask) | (Insert & Mask);
}

4
glm/gtc/bitfield.inl
View File

@@ -250,7 +250,7 @@ namespace detail
{
GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'mask' accepts only integer values");
return ~((~static_cast<genIUType>(0)) << Bits);
return Bits >= sizeof(genIUType) * 8 ? ~static_cast<genIUType>(0) : (static_cast<genIUType>(1) << Bits) - static_cast<genIUType>(1);
}
template <typename T, precision P, template <typename, precision> class vecIUType>
@@ -258,7 +258,7 @@ namespace detail
{
GLM_STATIC_ASSERT(std::numeric_limits<T>::is_integer, "'mask' accepts only integer values");
return ~((~static_cast<T>(0)) << v);
return detail::functor1<T, T, P, vecIUType>::call(mask, v);
}
template <typename genIType>