mewin/glm
1
0
Fork 0
Code Releases Activity

Reduced dependencies of GTX extensions. Removed some deprecated code.

Browse Source
This commit is contained in:
Christophe Riccio
2013-12-25 04:16:08 +01:00
parent 950eaa45cb
commit 9f8112f93a
24 changed files with 347 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
test/gtx/gtx_bit.cpp
View File

@@ -9,12 +9,11 @@
#include <emmintrin.h>
#include <glm/glm.hpp>
#include <glm/gtc/type_precision.hpp>
#include <glm/gtx/bit.hpp>
#include <glm/gtc/type_precision.hpp>
#if(GLM_ARCH != GLM_ARCH_PURE)
# include <glm/core/intrinsic_integer.hpp>
# include <glm/detail/intrinsic_integer.hpp>
#endif
#include <iostream>
@@ -29,96 +28,6 @@ enum result
STATIC_ASSERT
};
namespace extractField
{
template <typename genType, typename sizeType>
struct type
{
genType Value;
sizeType BitFirst;
sizeType BitCount;
genType Return;
result Result;
};
typedef type<glm::uint64, glm::uint> typeU64;
#if(((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) && (GLM_COMPILER < GLM_COMPILER_GCC44))
typeU64 const Data64[] =
{
{0xffffffffffffffffLLU, 8, 0, 0x0000000000000000LLU, SUCCESS},
{0x0000000000000000LLU, 0,64, 0x0000000000000000LLU, SUCCESS},
{0xffffffffffffffffLLU, 0,64, 0xffffffffffffffffLLU, SUCCESS},
{0x0f0f0f0f0f0f0f0fLLU, 0,64, 0x0f0f0f0f0f0f0f0fLLU, SUCCESS},
{0x0000000000000000LLU, 8, 0, 0x0000000000000000LLU, SUCCESS},
{0x8000000000000000LLU,63, 1, 0x0000000000000001LLU, SUCCESS},
{0x7fffffffffffffffLLU,63, 1, 0x0000000000000000LLU, SUCCESS},
{0x0000000000000300LLU, 8, 8, 0x0000000000000003LLU, SUCCESS},
{0x000000000000ff00LLU, 8, 8, 0x00000000000000ffLLU, SUCCESS},
{0xfffffffffffffff0LLU, 0, 5, 0x0000000000000010LLU, SUCCESS},
{0x00000000000000ffLLU, 1, 3, 0x0000000000000007LLU, SUCCESS},
{0x00000000000000ffLLU, 0, 3, 0x0000000000000007LLU, SUCCESS},
{0x0000000000000000LLU, 0, 2, 0x0000000000000000LLU, SUCCESS},
{0xffffffffffffffffLLU, 0, 8, 0x00000000000000ffLLU, SUCCESS},
{0xffffffff00000000LLU,32,32, 0x00000000ffffffffLLU, SUCCESS},
{0xfffffffffffffff0LLU, 0, 8, 0x0000000000000000LLU, FAIL},
{0xffffffffffffffffLLU,32,32, 0x0000000000000000LLU, FAIL},
//{0xffffffffffffffffLLU,64, 1, 0x0000000000000000LLU, ASSERT}, // Throw an assert
//{0xffffffffffffffffLLU, 0,65, 0x0000000000000000LLU, ASSERT}, // Throw an assert
//{0xffffffffffffffffLLU,33,32, 0x0000000000000000LLU, ASSERT}, // Throw an assert
};
#else
typeU64 const Data64[] =
{
{0xffffffffffffffff, 8, 0, 0x0000000000000000, SUCCESS},
{0x0000000000000000, 0,64, 0x0000000000000000, SUCCESS},
{0xffffffffffffffff, 0,64, 0xffffffffffffffff, SUCCESS},
{0x0f0f0f0f0f0f0f0f, 0,64, 0x0f0f0f0f0f0f0f0f, SUCCESS},
{0x0000000000000000, 8, 0, 0x0000000000000000, SUCCESS},
{0x8000000000000000,63, 1, 0x0000000000000001, SUCCESS},
{0x7fffffffffffffff,63, 1, 0x0000000000000000, SUCCESS},
{0x0000000000000300, 8, 8, 0x0000000000000003, SUCCESS},
{0x000000000000ff00, 8, 8, 0x00000000000000ff, SUCCESS},
{0xfffffffffffffff0, 0, 5, 0x0000000000000010, SUCCESS},
{0x00000000000000ff, 1, 3, 0x0000000000000007, SUCCESS},
{0x00000000000000ff, 0, 3, 0x0000000000000007, SUCCESS},
{0x0000000000000000, 0, 2, 0x0000000000000000, SUCCESS},
{0xffffffffffffffff, 0, 8, 0x00000000000000ff, SUCCESS},
{0xffffffff00000000,32,32, 0x00000000ffffffff, SUCCESS},
{0xfffffffffffffff0, 0, 8, 0x0000000000000000, FAIL},
{0xffffffffffffffff,32,32, 0x0000000000000000, FAIL},
//{0xffffffffffffffff,64, 1, 0x0000000000000000, ASSERT}, // Throw an assert
//{0xffffffffffffffff, 0,65, 0x0000000000000000, ASSERT}, // Throw an assert
//{0xffffffffffffffff,33,32, 0x0000000000000000, ASSERT}, // Throw an assert
};
#endif
int test()
{
glm::uint32 count = sizeof(Data64) / sizeof(typeU64);
for(glm::uint32 i = 0; i < count; ++i)
{
glm::uint64 Return = glm::extractField(
Data64[i].Value,
Data64[i].BitFirst,
Data64[i].BitCount);
bool Compare = Data64[i].Return == Return;
if(Data64[i].Result == SUCCESS && Compare)
continue;
else if(Data64[i].Result == FAIL && !Compare)
continue;
std::cout << "glm::extractfield test fail on test " << i << std::endl;
return 1;
}
return 0;
}
}//extractField
namespace bitRevert
{
template <typename genType>
@@ -596,7 +505,6 @@ int main()
Error += ::bitfieldInterleave3::test();
Error += ::bitfieldInterleave4::test();
Error += ::bitfieldInterleave::test();
Error += ::extractField::test();
Error += ::bitRevert::test();
return Error;