Fixed GTX_mixed_product build

master
Christophe Riccio ago%!(EXTRA string=12 years)
parent e818afba4d
commit aa318f6a43
  1. 2
      glm/ext.hpp
  2. 4
      glm/gtx/mixed_product.hpp
  3. 4
      glm/gtx/mixed_product.inl
  4. 2
      test/core/core_setup_precision.cpp

@ -73,7 +73,6 @@
#include "./gtc/quaternion.hpp" #include "./gtc/quaternion.hpp"
#include "./gtc/random.hpp" #include "./gtc/random.hpp"
#include "./gtc/reciprocal.hpp" #include "./gtc/reciprocal.hpp"
#include "./gtc/swizzle.hpp"
#include "./gtc/type_precision.hpp" #include "./gtc/type_precision.hpp"
#include "./gtc/type_ptr.hpp" #include "./gtc/type_ptr.hpp"
#include "./gtc/ulp.hpp" #include "./gtc/ulp.hpp"
@ -81,7 +80,6 @@
#include "./gtx/associated_min_max.hpp" #include "./gtx/associated_min_max.hpp"
#include "./gtx/bit.hpp" #include "./gtx/bit.hpp"
#include "./gtx/closest_point.hpp" #include "./gtx/closest_point.hpp"
#include "./gtx/color_cast.hpp"
#include "./gtx/color_space.hpp" #include "./gtx/color_space.hpp"
#include "./gtx/color_space_YCoCg.hpp" #include "./gtx/color_space_YCoCg.hpp"
#include "./gtx/compatibility.hpp" #include "./gtx/compatibility.hpp"

@ -51,8 +51,8 @@ namespace glm
/// @{ /// @{
/// @brief Mixed product of 3 vectors (from GLM_GTX_mixed_product extension) /// @brief Mixed product of 3 vectors (from GLM_GTX_mixed_product extension)
template <typename valType> template <typename T, precision P>
valType mixedProduct( T mixedProduct(
detail::tvec3<T, P> const & v1, detail::tvec3<T, P> const & v1,
detail::tvec3<T, P> const & v2, detail::tvec3<T, P> const & v2,
detail::tvec3<T, P> const & v3); detail::tvec3<T, P> const & v3);

@ -9,8 +9,8 @@
namespace glm namespace glm
{ {
template <typename valType> template <typename T, precision P>
GLM_FUNC_QUALIFIER valType mixedProduct GLM_FUNC_QUALIFIER T mixedProduct
( (
detail::tvec3<T, P> const & v1, detail::tvec3<T, P> const & v1,
detail::tvec3<T, P> const & v2, detail::tvec3<T, P> const & v2,

@ -7,8 +7,10 @@
// File : test/core/setup_precision_highp.cpp // File : test/core/setup_precision_highp.cpp
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
#define GLM_FORCE_INLINE
#define GLM_PRECISION_HIGHP_FLOAT #define GLM_PRECISION_HIGHP_FLOAT
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/ext.hpp>
static int test_mat() static int test_mat()
{ {

Loading…
Cancel
Save