mewin/glm
1
0
Fork 0
Code Releases Activity

Updated ceilPowerOfTwo for signed int support

Browse Source
This commit is contained in:
Christophe Riccio 2014-10-27 23:02:47 +01:00
parent 3420d691f5
commit a88d8935be
3 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
glm/gtc/integer.inl
View File

@ -48,7 +48,26 @@ namespace detail
}; };
template <typename T, precision P, template <typename, precision> class vecType, bool isSigned = true> template <typename T, precision P, template <typename, precision> class vecType, bool isSigned = true>
struct compute_ceilPowerOfTwo{}; struct compute_ceilPowerOfTwo
{
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x)
{
GLM_STATIC_ASSERT(!std::numeric_limits<T>::is_iec559, "'ceilPowerOfTwo' only accept integer scalar or vector inputs");
vecType<T, P> const Sign(sign(x));
vecType<T, P> v(abs(x));
v = v - static_cast<T>(1);
v = v | (v >> static_cast<T>(1));
v = v | (v >> static_cast<T>(2));
v = v | (v >> static_cast<T>(4));
v = compute_ceilShift<T, P, vecType, sizeof(T) >= 2>::call(v, 8);
v = compute_ceilShift<T, P, vecType, sizeof(T) >= 4>::call(v, 16);
v = compute_ceilShift<T, P, vecType, sizeof(T) >= 8>::call(v, 32);
return (v + static_cast<T>(1)) * Sign;
}
};
template <typename T, precision P, template <typename, precision> class vecType> template <typename T, precision P, template <typename, precision> class vecType>
struct compute_ceilPowerOfTwo<T, P, vecType, false> struct compute_ceilPowerOfTwo<T, P, vecType, false>

2
test/core/core_func_integer.cpp
View File

@ -526,7 +526,7 @@ namespace findMSB
int Error(0); int Error(0);
Error += test_findMSB(); Error += test_findMSB();
Error += test_nlz1(); //Error += test_nlz1();
return Error; return Error;
} }

30
test/gtc/gtc_integer.cpp
View File

@ -179,6 +179,35 @@ namespace ceilPowerOfTwo
genType Return; genType Return;
}; };
int test_int32()
{
type<glm::int32> const Data[] =
{
{0x0000ffff, 0x00010000},
{-3, -4},
{-8, -8},
{0x00000001, 0x00000001},
{0x00000002, 0x00000002},
{0x00000004, 0x00000004},
{0x00000007, 0x00000008},
{0x0000fff0, 0x00010000},
{0x0000f000, 0x00010000},
{0x08000000, 0x08000000},
{0x00000000, 0x00000000},
{0x00000003, 0x00000004}
};
int Error(0);
for(std::size_t i = 0, n = sizeof(Data) / sizeof(type<glm::int32>); i < n; ++i)
{
glm::int32 Result = glm::ceilPowerOfTwo(Data[i].Value);
Error += Data[i].Return == Result ? 0 : 1;
}
return Error;
}
int test_uint32() int test_uint32()
{ {
type<glm::uint32> const Data[] = type<glm::uint32> const Data[] =
@ -235,6 +264,7 @@ namespace ceilPowerOfTwo
{ {
int Error(0); int Error(0);
Error += test_int32();
Error += test_uint32(); Error += test_uint32();
return Error; return Error;