mewin/glm
1
0
Fork 0
Code Releases Activity

Move GTC_type_aligned to GTX extensions

Browse Source
This commit is contained in:
Christophe Riccio 2014-11-23 21:00:17 +01:00
parent 7621a735a3
commit 97182990a7
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glm/ext.hpp
View File

@ -125,6 +125,7 @@
#endif #endif
#include "./gtx/transform.hpp" #include "./gtx/transform.hpp"
#include "./gtx/transform2.hpp" #include "./gtx/transform2.hpp"
#include "./gtx/type_aligned.hpp"
#include "./gtx/vector_angle.hpp" #include "./gtx/vector_angle.hpp"
#include "./gtx/vector_query.hpp" #include "./gtx/vector_query.hpp"
#include "./gtx/wrap.hpp" #include "./gtx/wrap.hpp"

24
test/gtx/gtx_type_aligned.cpp
View File

@ -7,11 +7,9 @@
// File : test/gtc/type_aligned.cpp // File : test/gtc/type_aligned.cpp
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
#include <glm/gtc/type_aligned.hpp> #include <glm/gtx/type_aligned.hpp>
#include <cstdio> #include <cstdio>
typedef __declspec(align(1)) glm::vec3 unaligned_vec3;
int test_decl() int test_decl()
{ {
int Error(0); int Error(0);
@ -45,25 +43,7 @@ int test_decl()
glm::aligned_vec3 B; glm::aligned_vec3 B;
}; };
struct S3 printf("vec3: %d, aligned: %d\n", sizeof(S1), sizeof(S2));
{
bool A;
unaligned_vec3 B;
};
struct S4
{
short B;
bool A;
};
struct S5
{
bool A;
float B[3];
};
printf("vec3: %d, aligned: %d, unaligned: %d, bool: %d, array: %d\n", sizeof(S1), sizeof(S2), sizeof(S3), sizeof(S4), sizeof(S5));
Error += sizeof(S1) <= sizeof(S2) ? 0 : 1; Error += sizeof(S1) <= sizeof(S2) ? 0 : 1;
} }