mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed CUDA compiler error in type_vec4.inl #504

Browse Source
This commit is contained in:
Christophe Riccio
2016-05-04 16:35:57 +02:00
parent 1f71f6fb3a
commit affd5f3ba0
7 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glm/detail/func_common.inl
View File

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

2
glm/detail/func_geometric.inl
View File

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

2
glm/detail/func_integer.inl
View File

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

2
glm/detail/func_matrix.inl
View File

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

2
glm/detail/type_mat4x4.inl
View File

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

2
glm/detail/type_vec4.inl
View File

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

7
test/core/core_type_vec3.cpp
View File

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