diff --git a/glm/ext.hpp b/glm/ext.hpp index 95121dc7..89a55287 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -73,7 +73,6 @@ #include "./gtc/quaternion.hpp" #include "./gtc/random.hpp" #include "./gtc/reciprocal.hpp" -#include "./gtc/swizzle.hpp" #include "./gtc/type_precision.hpp" #include "./gtc/type_ptr.hpp" #include "./gtc/ulp.hpp" @@ -81,7 +80,6 @@ #include "./gtx/associated_min_max.hpp" #include "./gtx/bit.hpp" #include "./gtx/closest_point.hpp" -#include "./gtx/color_cast.hpp" #include "./gtx/color_space.hpp" #include "./gtx/color_space_YCoCg.hpp" #include "./gtx/compatibility.hpp" diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index 162607a4..e1bbb62a 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -51,8 +51,8 @@ namespace glm /// @{ /// @brief Mixed product of 3 vectors (from GLM_GTX_mixed_product extension) - template - valType mixedProduct( + template + T mixedProduct( detail::tvec3 const & v1, detail::tvec3 const & v2, detail::tvec3 const & v3); diff --git a/glm/gtx/mixed_product.inl b/glm/gtx/mixed_product.inl index dca57939..8fa03591 100644 --- a/glm/gtx/mixed_product.inl +++ b/glm/gtx/mixed_product.inl @@ -9,8 +9,8 @@ namespace glm { - template - GLM_FUNC_QUALIFIER valType mixedProduct + template + GLM_FUNC_QUALIFIER T mixedProduct ( detail::tvec3 const & v1, detail::tvec3 const & v2, diff --git a/test/core/core_setup_precision.cpp b/test/core/core_setup_precision.cpp index 718745cc..e60843c7 100644 --- a/test/core/core_setup_precision.cpp +++ b/test/core/core_setup_precision.cpp @@ -7,8 +7,10 @@ // File : test/core/setup_precision_highp.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// +#define GLM_FORCE_INLINE #define GLM_PRECISION_HIGHP_FLOAT #include +#include static int test_mat() {