From 97182990a7473067887a535cca06110defb0c95a Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 23 Nov 2014 21:00:17 +0100 Subject: [PATCH] Move GTC_type_aligned to GTX extensions --- glm/ext.hpp | 1 + test/gtx/gtx_type_aligned.cpp | 24 ++---------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/glm/ext.hpp b/glm/ext.hpp index ea0b009e..7a9dde77 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -125,6 +125,7 @@ #endif #include "./gtx/transform.hpp" #include "./gtx/transform2.hpp" +#include "./gtx/type_aligned.hpp" #include "./gtx/vector_angle.hpp" #include "./gtx/vector_query.hpp" #include "./gtx/wrap.hpp" diff --git a/test/gtx/gtx_type_aligned.cpp b/test/gtx/gtx_type_aligned.cpp index 12ac5949..061cf3f5 100644 --- a/test/gtx/gtx_type_aligned.cpp +++ b/test/gtx/gtx_type_aligned.cpp @@ -7,11 +7,9 @@ // File : test/gtc/type_aligned.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include +#include #include -typedef __declspec(align(1)) glm::vec3 unaligned_vec3; - int test_decl() { int Error(0); @@ -45,25 +43,7 @@ int test_decl() glm::aligned_vec3 B; }; - struct S3 - { - 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)); + printf("vec3: %d, aligned: %d\n", sizeof(S1), sizeof(S2)); Error += sizeof(S1) <= sizeof(S2) ? 0 : 1; }