Browse Source

Fixed CUDA compiler error in type_vec4.inl #504

Christophe Riccio 9 years ago
parent
commit
affd5f3ba0

+ 1 - 1
glm/detail/func_common.inl

@@ -734,6 +734,6 @@ namespace detail
 	}
 }//namespace glm
 
-#if GLM_ARCH != GLM_FORCE_PURE
+#if GLM_ARCH != GLM_ARCH_PURE
 #	include "func_common_simd.inl"
 #endif

+ 1 - 1
glm/detail/func_geometric.inl

@@ -171,6 +171,6 @@ namespace detail
 	}
 }//namespace glm
 
-#if GLM_ARCH != GLM_FORCE_PURE
+#if GLM_ARCH != GLM_ARCH_PURE
 #	include "func_geometric_simd.inl"
 #endif

+ 1 - 1
glm/detail/func_integer.inl

@@ -359,7 +359,7 @@ namespace detail
 	}
 }//namespace glm
 
-#if GLM_ARCH != GLM_FORCE_PURE
+#if GLM_ARCH != GLM_ARCH_PURE
 #	include "func_integer_simd.inl"
 #endif
 

+ 1 - 1
glm/detail/func_matrix.inl

@@ -279,7 +279,7 @@ namespace detail
 	}
 }//namespace glm
 
-#if GLM_ARCH != GLM_FORCE_PURE
+#if GLM_ARCH != GLM_ARCH_PURE
 #	include "func_matrix_simd.inl"
 #endif
 

+ 1 - 1
glm/detail/type_mat4x4.inl

@@ -759,6 +759,6 @@ namespace detail
 	}
 }//namespace glm
 
-#if GLM_ARCH != GLM_FORCE_PURE
+#if GLM_ARCH != GLM_ARCH_PURE
 #	include "type_mat4x4_simd.inl"
 #endif

+ 1 - 1
glm/detail/type_vec4.inl

@@ -1180,6 +1180,6 @@ namespace glm
 	}
 }//namespace glm
 
-#if GLM_ARCH != GLM_FORCE_PURE
+#if GLM_ARCH != GLM_ARCH_PURE
 #	include "type_vec4_simd.inl"
 #endif

+ 7 - 0
test/core/core_type_vec3.cpp

@@ -113,6 +113,13 @@ int test_vec3_ctor()
 	return Error;
 }
 
+float foo()
+{
+	glm::vec3 bar = glm::vec3(0.0f, 1.0f, 1.0f);
+
+	return glm::length(bar);
+}
+
 int test_vec3_operators()
 {
 	int Error = 0;