Browse Source

Move GTC_type_aligned to GTX extensions

Christophe Riccio 11 years ago
parent
commit
97182990a7
2 changed files with 3 additions and 22 deletions
  1. 1 0
      glm/ext.hpp
  2. 2 22
      test/gtx/gtx_type_aligned.cpp

+ 1 - 0
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"

+ 2 - 22
test/gtx/gtx_type_aligned.cpp

@@ -7,11 +7,9 @@
 // File    : test/gtc/type_aligned.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include <glm/gtc/type_aligned.hpp>
+#include <glm/gtx/type_aligned.hpp>
 #include <cstdio>
 
-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;
 	}