Fixed roundPowerOfTwo and floorPowerOfTwo #503

This commit is contained in:
Christophe Riccio
2016-04-29 10:51:21 +02:00
parent 9770c9f73d
commit 76d12fb602
2 changed files with 33 additions and 4 deletions

View File

@@ -30,8 +30,9 @@
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
namespace glm
{
#include "../detail/func_integer.hpp"
namespace glm{
namespace detail
{
template <typename T, precision P, template <typename, precision> class vecType, bool compute = false>
@@ -275,7 +276,7 @@ namespace detail
template <typename genType>
GLM_FUNC_QUALIFIER genType floorPowerOfTwo(genType value)
{
return isPowerOfTwo(value) ? value : highestBitValue(value);
return isPowerOfTwo(value) ? value : findMSB(value);
}
template <typename T, precision P, template <typename, precision> class vecType>
@@ -293,7 +294,7 @@ namespace detail
if(isPowerOfTwo(value))
return value;
genIUType const prev = highestBitValue(value);
genIUType const prev = findMSB(value);
genIUType const next = prev << 1;
return (next - value) < (value - prev) ? next : prev;
}