mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-29 11:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test suite on big endian platforms

Browse Source
This commit is contained in:
Max Rees 2020-03-15 15:13:27 -04:00
parent efbfecab63
commit 06ce42e723
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
glm/gtc/packing.inl
View File

@ -9,6 +9,9 @@
#include "../detail/type_half.hpp" #include "../detail/type_half.hpp"
#include <cstring> #include <cstring>
#include <limits> #include <limits>
extern "C" {
#include <endian.h>
}
namespace glm{ namespace glm{
namespace detail namespace detail
@ -183,9 +186,15 @@ namespace detail
{ {
struct struct
{ {
#if BYTE_ORDER == LITTLE_ENDIAN
uint x : 3; uint x : 3;
uint y : 3; uint y : 3;
uint z : 2; uint z : 2;
#else
uint z : 2;
uint y : 3;
uint x : 3;
#endif
} data; } data;
uint8 pack; uint8 pack;
}; };
@ -194,8 +203,13 @@ namespace detail
{ {
struct struct
{ {
#if BYTE_ORDER == LITTLE_ENDIAN
uint x : 4; uint x : 4;
uint y : 4; uint y : 4;
#else
uint y : 4;
uint x : 4;
#endif
} data; } data;
uint8 pack; uint8 pack;
}; };
@ -204,10 +218,17 @@ namespace detail
{ {
struct struct
{ {
#if BYTE_ORDER == LITTLE_ENDIAN
uint x : 4; uint x : 4;
uint y : 4; uint y : 4;
uint z : 4; uint z : 4;
uint w : 4; uint w : 4;
#else
uint w : 4;
uint z : 4;
uint y : 4;
uint x : 4;
#endif
} data; } data;
uint16 pack; uint16 pack;
}; };
@ -216,9 +237,15 @@ namespace detail
{ {
struct struct
{ {
#if BYTE_ORDER == LITTLE_ENDIAN
uint x : 5; uint x : 5;
uint y : 6; uint y : 6;
uint z : 5; uint z : 5;
#else
uint z : 5;
uint y : 6;
uint x : 5;
#endif
} data; } data;
uint16 pack; uint16 pack;
}; };
@ -227,10 +254,17 @@ namespace detail
{ {
struct struct
{ {
#if BYTE_ORDER == LITTLE_ENDIAN
uint x : 5; uint x : 5;
uint y : 5; uint y : 5;
uint z : 5; uint z : 5;
uint w : 1; uint w : 1;
#else
uint w : 1;
uint z : 5;
uint y : 5;
uint x : 5;
#endif
} data; } data;
uint16 pack; uint16 pack;
}; };
@ -239,10 +273,17 @@ namespace detail
{ {
struct struct
{ {
#if BYTE_ORDER == LITTLE_ENDIAN
uint x : 10; uint x : 10;
uint y : 10; uint y : 10;
uint z : 10; uint z : 10;
uint w : 2; uint w : 2;
#else
uint w : 2;
uint z : 10;
uint y : 10;
uint x : 10;
#endif
} data; } data;
uint32 pack; uint32 pack;
}; };
@ -251,10 +292,17 @@ namespace detail
{ {
struct struct
{ {
#if BYTE_ORDER == LITTLE_ENDIAN
int x : 10; int x : 10;
int y : 10; int y : 10;
int z : 10; int z : 10;
int w : 2; int w : 2;
#else
int w : 2;
int z : 10;
int y : 10;
int x : 10;
#endif
} data; } data;
uint32 pack; uint32 pack;
}; };
@ -263,10 +311,17 @@ namespace detail
{ {
struct struct
{ {
#if BYTE_ORDER == LITTLE_ENDIAN
uint x : 9; uint x : 9;
uint y : 9; uint y : 9;
uint z : 9; uint z : 9;
uint w : 5; uint w : 5;
#else
uint w : 5;
uint z : 9;
uint y : 9;
uint x : 9;
#endif
} data; } data;
uint32 pack; uint32 pack;
}; };

3
test/gtc/gtc_packing.cpp
View File

@ -4,6 +4,7 @@
#include <glm/ext/vector_relational.hpp> #include <glm/ext/vector_relational.hpp>
#include <cstdio> #include <cstdio>
#include <vector> #include <vector>
#include <arpa/inet.h>
void print_bits(float const& s) void print_bits(float const& s)
{ {
@ -156,7 +157,7 @@ int test_U3x10_1x2()
glm::u8vec4 const v0(0xff, 0x77, 0x0, 0x33); glm::u8vec4 const v0(0xff, 0x77, 0x0, 0x33);
glm::uint32 const p0 = *reinterpret_cast<glm::uint32 const*>(&v0[0]); glm::uint32 const p0 = *reinterpret_cast<glm::uint32 const*>(&v0[0]);
glm::uint32 const r0 = 0x330077ff; glm::uint32 const r0 = htonl(0xff770033);
Error += p0 == r0 ? 0 : 1; Error += p0 == r0 ? 0 : 1;