summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/glm/glm/detail/setup.hpp23
-rw-r--r--3rdparty/glm/glm/detail/type_mat2x2.hpp2
-rw-r--r--3rdparty/glm/glm/detail/type_mat2x2.inl2
-rw-r--r--3rdparty/glm/glm/detail/type_mat2x3.hpp2
-rw-r--r--3rdparty/glm/glm/detail/type_mat2x3.inl2
-rw-r--r--3rdparty/glm/glm/detail/type_mat2x4.hpp2
-rw-r--r--3rdparty/glm/glm/detail/type_mat2x4.inl2
-rw-r--r--3rdparty/glm/glm/detail/type_mat3x2.hpp2
-rw-r--r--3rdparty/glm/glm/detail/type_mat3x2.inl2
-rw-r--r--3rdparty/glm/glm/detail/type_mat3x3.hpp2
-rw-r--r--3rdparty/glm/glm/detail/type_mat3x3.inl2
-rw-r--r--3rdparty/glm/glm/detail/type_mat3x4.hpp2
-rw-r--r--3rdparty/glm/glm/detail/type_mat3x4.inl2
-rw-r--r--3rdparty/glm/glm/detail/type_mat4x2.hpp2
-rw-r--r--3rdparty/glm/glm/detail/type_mat4x2.inl2
-rw-r--r--3rdparty/glm/glm/detail/type_mat4x3.hpp4
-rw-r--r--3rdparty/glm/glm/detail/type_mat4x3.inl2
-rw-r--r--3rdparty/glm/glm/detail/type_mat4x4.hpp2
-rw-r--r--3rdparty/glm/glm/detail/type_mat4x4.inl2
-rw-r--r--3rdparty/glm/glm/detail/type_vec1.hpp4
-rw-r--r--3rdparty/glm/glm/detail/type_vec1.inl4
-rw-r--r--3rdparty/glm/glm/detail/type_vec2.hpp4
-rw-r--r--3rdparty/glm/glm/detail/type_vec2.inl4
-rw-r--r--3rdparty/glm/glm/detail/type_vec3.hpp4
-rw-r--r--3rdparty/glm/glm/detail/type_vec3.inl4
-rw-r--r--3rdparty/glm/glm/detail/type_vec4.hpp6
-rw-r--r--3rdparty/glm/glm/detail/type_vec4.inl6
-rw-r--r--3rdparty/glm/glm/detail/type_vec4_simd.inl6
-rw-r--r--3rdparty/glm/glm/gtc/quaternion.hpp2
-rw-r--r--3rdparty/glm/glm/gtc/quaternion.inl2
-rw-r--r--3rdparty/glm/glm/gtx/dual_quaternion.hpp6
-rw-r--r--3rdparty/glm/glm/gtx/dual_quaternion.inl6
32 files changed, 67 insertions, 52 deletions
diff --git a/3rdparty/glm/glm/detail/setup.hpp b/3rdparty/glm/glm/detail/setup.hpp
index 4bae915050a..43083743b31 100644
--- a/3rdparty/glm/glm/detail/setup.hpp
+++ b/3rdparty/glm/glm/detail/setup.hpp
@@ -723,16 +723,31 @@
# define GLM_DEFAULT_CTOR
#endif
-#if GLM_HAS_CONSTEXPR_PARTIAL
+#if GLM_HAS_CONSTEXPR
+# define GLM_CONSTEXPR constexpr
+# define GLM_CONSTEXPR_CTOR constexpr
+# define GLM_RELAXED_CONSTEXPR constexpr
+#elif GLM_HAS_CONSTEXPR_PARTIAL
# define GLM_CONSTEXPR constexpr
+# define GLM_CONSTEXPR_CTOR
+# define GLM_RELAXED_CONSTEXPR const
#else
# define GLM_CONSTEXPR
+# define GLM_CONSTEXPR_CTOR
+# define GLM_RELAXED_CONSTEXPR const
#endif
-#if GLM_HAS_CONSTEXPR
-# define GLM_RELAXED_CONSTEXPR constexpr
+#if GLM_ARCH == GLM_ARCH_PURE
+# define GLM_CONSTEXPR_SIMD GLM_CONSTEXPR
#else
-# define GLM_RELAXED_CONSTEXPR const
+# define GLM_CONSTEXPR_SIMD
+#endif
+
+// GCC 4.6 has a bug causing a compiler crash
+#if GLM_COMPILER & GLM_COMPILER_GCC
+# define GLM_CONSTEXPR_GCC
+#else
+# define GLM_CONSTEXPR_GCC GLM_CONSTEXPR
#endif
#ifdef GLM_FORCE_EXPLICIT_CTOR
diff --git a/3rdparty/glm/glm/detail/type_mat2x2.hpp b/3rdparty/glm/glm/detail/type_mat2x2.hpp
index 5505ffe5b80..f188b4d0d95 100644
--- a/3rdparty/glm/glm/detail/type_mat2x2.hpp
+++ b/3rdparty/glm/glm/detail/type_mat2x2.hpp
@@ -60,7 +60,7 @@ namespace glm
template <precision Q>
GLM_FUNC_DECL tmat2x2(tmat2x2<T, Q> const & m);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat2x2(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tmat2x2(ctor);
GLM_FUNC_DECL explicit tmat2x2(T scalar);
GLM_FUNC_DECL tmat2x2(
T const & x1, T const & y1,
diff --git a/3rdparty/glm/glm/detail/type_mat2x2.inl b/3rdparty/glm/glm/detail/type_mat2x2.inl
index da426ebbe21..c1eb176acc1 100644
--- a/3rdparty/glm/glm/detail/type_mat2x2.inl
+++ b/3rdparty/glm/glm/detail/type_mat2x2.inl
@@ -81,7 +81,7 @@ namespace detail
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x2<T, P>::tmat2x2(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat2x2<T, P>::tmat2x2(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/detail/type_mat2x3.hpp b/3rdparty/glm/glm/detail/type_mat2x3.hpp
index cccdb6cde5e..0eaf454b2f8 100644
--- a/3rdparty/glm/glm/detail/type_mat2x3.hpp
+++ b/3rdparty/glm/glm/detail/type_mat2x3.hpp
@@ -61,7 +61,7 @@ namespace glm
template <precision Q>
GLM_FUNC_DECL tmat2x3(tmat2x3<T, Q> const & m);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat2x3(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tmat2x3(ctor);
GLM_FUNC_DECL explicit tmat2x3(T scalar);
GLM_FUNC_DECL tmat2x3(
T x0, T y0, T z0,
diff --git a/3rdparty/glm/glm/detail/type_mat2x3.inl b/3rdparty/glm/glm/detail/type_mat2x3.inl
index 620716af82e..3af09be1888 100644
--- a/3rdparty/glm/glm/detail/type_mat2x3.inl
+++ b/3rdparty/glm/glm/detail/type_mat2x3.inl
@@ -63,7 +63,7 @@ namespace glm
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3<T, P>::tmat2x3(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat2x3<T, P>::tmat2x3(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/detail/type_mat2x4.hpp b/3rdparty/glm/glm/detail/type_mat2x4.hpp
index 51cd965d946..ef8f4af962e 100644
--- a/3rdparty/glm/glm/detail/type_mat2x4.hpp
+++ b/3rdparty/glm/glm/detail/type_mat2x4.hpp
@@ -61,7 +61,7 @@ namespace glm
template <precision Q>
GLM_FUNC_DECL tmat2x4(tmat2x4<T, Q> const & m);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat2x4(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tmat2x4(ctor);
GLM_FUNC_DECL explicit tmat2x4(T scalar);
GLM_FUNC_DECL tmat2x4(
T x0, T y0, T z0, T w0,
diff --git a/3rdparty/glm/glm/detail/type_mat2x4.inl b/3rdparty/glm/glm/detail/type_mat2x4.inl
index 99ac7f54c0f..3542443de34 100644
--- a/3rdparty/glm/glm/detail/type_mat2x4.inl
+++ b/3rdparty/glm/glm/detail/type_mat2x4.inl
@@ -63,7 +63,7 @@ namespace glm
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4<T, P>::tmat2x4(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat2x4<T, P>::tmat2x4(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/detail/type_mat3x2.hpp b/3rdparty/glm/glm/detail/type_mat3x2.hpp
index 73470d15502..8158f77622a 100644
--- a/3rdparty/glm/glm/detail/type_mat3x2.hpp
+++ b/3rdparty/glm/glm/detail/type_mat3x2.hpp
@@ -61,7 +61,7 @@ namespace glm
template <precision Q>
GLM_FUNC_DECL tmat3x2(tmat3x2<T, Q> const & m);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat3x2(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tmat3x2(ctor);
GLM_FUNC_DECL explicit tmat3x2(T scalar);
GLM_FUNC_DECL tmat3x2(
T x0, T y0,
diff --git a/3rdparty/glm/glm/detail/type_mat3x2.inl b/3rdparty/glm/glm/detail/type_mat3x2.inl
index 4a9dc7ee434..a64bfc5199a 100644
--- a/3rdparty/glm/glm/detail/type_mat3x2.inl
+++ b/3rdparty/glm/glm/detail/type_mat3x2.inl
@@ -66,7 +66,7 @@ namespace glm
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2<T, P>::tmat3x2(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat3x2<T, P>::tmat3x2(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/detail/type_mat3x3.hpp b/3rdparty/glm/glm/detail/type_mat3x3.hpp
index e6279678bca..4eb5cd778b7 100644
--- a/3rdparty/glm/glm/detail/type_mat3x3.hpp
+++ b/3rdparty/glm/glm/detail/type_mat3x3.hpp
@@ -60,7 +60,7 @@ namespace glm
template <precision Q>
GLM_FUNC_DECL tmat3x3(tmat3x3<T, Q> const & m);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat3x3(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tmat3x3(ctor);
GLM_FUNC_DECL explicit tmat3x3(T scalar);
GLM_FUNC_DECL tmat3x3(
T x0, T y0, T z0,
diff --git a/3rdparty/glm/glm/detail/type_mat3x3.inl b/3rdparty/glm/glm/detail/type_mat3x3.inl
index e77655eec11..917d6a88527 100644
--- a/3rdparty/glm/glm/detail/type_mat3x3.inl
+++ b/3rdparty/glm/glm/detail/type_mat3x3.inl
@@ -90,7 +90,7 @@ namespace detail
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3<T, P>::tmat3x3(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat3x3<T, P>::tmat3x3(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/detail/type_mat3x4.hpp b/3rdparty/glm/glm/detail/type_mat3x4.hpp
index 8cf67945687..4778b8fc4af 100644
--- a/3rdparty/glm/glm/detail/type_mat3x4.hpp
+++ b/3rdparty/glm/glm/detail/type_mat3x4.hpp
@@ -61,7 +61,7 @@ namespace glm
template <precision Q>
GLM_FUNC_DECL tmat3x4(tmat3x4<T, Q> const & m);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat3x4(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tmat3x4(ctor);
GLM_FUNC_DECL explicit tmat3x4(T scalar);
GLM_FUNC_DECL tmat3x4(
T x0, T y0, T z0, T w0,
diff --git a/3rdparty/glm/glm/detail/type_mat3x4.inl b/3rdparty/glm/glm/detail/type_mat3x4.inl
index 8680601096c..827c327c016 100644
--- a/3rdparty/glm/glm/detail/type_mat3x4.inl
+++ b/3rdparty/glm/glm/detail/type_mat3x4.inl
@@ -66,7 +66,7 @@ namespace glm
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat3x4<T, P>::tmat3x4(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/detail/type_mat4x2.hpp b/3rdparty/glm/glm/detail/type_mat4x2.hpp
index 1a6d3593707..a8cd0f3004a 100644
--- a/3rdparty/glm/glm/detail/type_mat4x2.hpp
+++ b/3rdparty/glm/glm/detail/type_mat4x2.hpp
@@ -61,7 +61,7 @@ namespace glm
template <precision Q>
GLM_FUNC_DECL tmat4x2(tmat4x2<T, Q> const & m);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x2(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tmat4x2(ctor);
GLM_FUNC_DECL explicit tmat4x2(T scalar);
GLM_FUNC_DECL tmat4x2(
T x0, T y0,
diff --git a/3rdparty/glm/glm/detail/type_mat4x2.inl b/3rdparty/glm/glm/detail/type_mat4x2.inl
index 1cccb9e0824..f374984e197 100644
--- a/3rdparty/glm/glm/detail/type_mat4x2.inl
+++ b/3rdparty/glm/glm/detail/type_mat4x2.inl
@@ -76,7 +76,7 @@ namespace glm
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2<T, P>::tmat4x2(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat4x2<T, P>::tmat4x2(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/detail/type_mat4x3.hpp b/3rdparty/glm/glm/detail/type_mat4x3.hpp
index 15ec39a14bb..7aae7bdd359 100644
--- a/3rdparty/glm/glm/detail/type_mat4x3.hpp
+++ b/3rdparty/glm/glm/detail/type_mat4x3.hpp
@@ -57,11 +57,11 @@ namespace glm
// -- Constructors --
GLM_FUNC_DECL tmat4x3() GLM_DEFAULT_CTOR;
- GLM_FUNC_DECL GLM_CONSTEXPR tmat4x3(tmat4x3<T, P> const & m) GLM_DEFAULT;
+ GLM_FUNC_DECL tmat4x3(tmat4x3<T, P> const & m) GLM_DEFAULT;
template <precision Q>
GLM_FUNC_DECL tmat4x3(tmat4x3<T, Q> const & m);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x3(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tmat4x3(ctor);
GLM_FUNC_DECL explicit tmat4x3(T const & x);
GLM_FUNC_DECL tmat4x3(
T const & x0, T const & y0, T const & z0,
diff --git a/3rdparty/glm/glm/detail/type_mat4x3.inl b/3rdparty/glm/glm/detail/type_mat4x3.inl
index d285c6ef14f..da118ff1a01 100644
--- a/3rdparty/glm/glm/detail/type_mat4x3.inl
+++ b/3rdparty/glm/glm/detail/type_mat4x3.inl
@@ -69,7 +69,7 @@ namespace glm
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3<T, P>::tmat4x3(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat4x3<T, P>::tmat4x3(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/detail/type_mat4x4.hpp b/3rdparty/glm/glm/detail/type_mat4x4.hpp
index 2e4c794e089..84362fa073e 100644
--- a/3rdparty/glm/glm/detail/type_mat4x4.hpp
+++ b/3rdparty/glm/glm/detail/type_mat4x4.hpp
@@ -60,7 +60,7 @@ namespace glm
template <precision Q>
GLM_FUNC_DECL tmat4x4(tmat4x4<T, Q> const & m);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x4(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tmat4x4(ctor);
GLM_FUNC_DECL explicit tmat4x4(T const & x);
GLM_FUNC_DECL tmat4x4(
T const & x0, T const & y0, T const & z0, T const & w0,
diff --git a/3rdparty/glm/glm/detail/type_mat4x4.inl b/3rdparty/glm/glm/detail/type_mat4x4.inl
index 09685a3fb89..27231863371 100644
--- a/3rdparty/glm/glm/detail/type_mat4x4.inl
+++ b/3rdparty/glm/glm/detail/type_mat4x4.inl
@@ -129,7 +129,7 @@ namespace detail
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4<T, P>::tmat4x4(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat4x4<T, P>::tmat4x4(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/detail/type_vec1.hpp b/3rdparty/glm/glm/detail/type_vec1.hpp
index 1ee2a4b2ee1..472c89bd951 100644
--- a/3rdparty/glm/glm/detail/type_vec1.hpp
+++ b/3rdparty/glm/glm/detail/type_vec1.hpp
@@ -101,8 +101,8 @@ namespace glm
// -- Explicit basic constructors --
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec1(ctor);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec1(T scalar);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec1(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec1(T scalar);
// -- Conversion vector constructors --
diff --git a/3rdparty/glm/glm/detail/type_vec1.inl b/3rdparty/glm/glm/detail/type_vec1.inl
index 23ee0ff84a1..364327619aa 100644
--- a/3rdparty/glm/glm/detail/type_vec1.inl
+++ b/3rdparty/glm/glm/detail/type_vec1.inl
@@ -59,11 +59,11 @@ namespace glm
// -- Explicit basic constructors --
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec1<T, P>::tvec1(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec1<T, P>::tvec1(ctor)
{}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec1<T, P>::tvec1(T scalar)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec1<T, P>::tvec1(T scalar)
: x(scalar)
{}
diff --git a/3rdparty/glm/glm/detail/type_vec2.hpp b/3rdparty/glm/glm/detail/type_vec2.hpp
index 84f05add50d..24d05e22111 100644
--- a/3rdparty/glm/glm/detail/type_vec2.hpp
+++ b/3rdparty/glm/glm/detail/type_vec2.hpp
@@ -101,8 +101,8 @@ namespace glm
// -- Explicit basic constructors --
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec2(ctor);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec2(T scalar);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec2(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec2(T scalar);
GLM_FUNC_DECL GLM_CONSTEXPR tvec2(T s1, T s2);
// -- Conversion constructors --
diff --git a/3rdparty/glm/glm/detail/type_vec2.inl b/3rdparty/glm/glm/detail/type_vec2.inl
index 0c5b8f1c951..4daccbea4f8 100644
--- a/3rdparty/glm/glm/detail/type_vec2.inl
+++ b/3rdparty/glm/glm/detail/type_vec2.inl
@@ -68,11 +68,11 @@ namespace glm
// -- Explicit basic constructors --
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec2<T, P>::tvec2(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec2<T, P>::tvec2(ctor)
{}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec2<T, P>::tvec2(T scalar)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec2<T, P>::tvec2(T scalar)
: x(scalar), y(scalar)
{}
diff --git a/3rdparty/glm/glm/detail/type_vec3.hpp b/3rdparty/glm/glm/detail/type_vec3.hpp
index 5c3829ffa95..d77834e1d93 100644
--- a/3rdparty/glm/glm/detail/type_vec3.hpp
+++ b/3rdparty/glm/glm/detail/type_vec3.hpp
@@ -102,8 +102,8 @@ namespace glm
// -- Explicit basic constructors --
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec3(ctor);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec3(T scalar);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec3(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_GCC explicit tvec3(T scalar);
GLM_FUNC_DECL GLM_CONSTEXPR tvec3(T a, T b, T c);
// -- Conversion scalar constructors --
diff --git a/3rdparty/glm/glm/detail/type_vec3.inl b/3rdparty/glm/glm/detail/type_vec3.inl
index fbb9ab085ef..574e56069f5 100644
--- a/3rdparty/glm/glm/detail/type_vec3.inl
+++ b/3rdparty/glm/glm/detail/type_vec3.inl
@@ -85,11 +85,11 @@ namespace glm
// -- Explicit basic constructors --
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec3<T, P>::tvec3(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec3<T, P>::tvec3(ctor)
{}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec3<T, P>::tvec3(T scalar)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_GCC tvec3<T, P>::tvec3(T scalar)
: x(scalar), y(scalar), z(scalar)
{}
diff --git a/3rdparty/glm/glm/detail/type_vec4.hpp b/3rdparty/glm/glm/detail/type_vec4.hpp
index 0be564d76f7..d54c45c4792 100644
--- a/3rdparty/glm/glm/detail/type_vec4.hpp
+++ b/3rdparty/glm/glm/detail/type_vec4.hpp
@@ -157,9 +157,9 @@ namespace detail
// -- Explicit basic constructors --
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec4(ctor);
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tvec4(T scalar);
- GLM_FUNC_DECL GLM_CONSTEXPR tvec4(T a, T b, T c, T d);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tvec4(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_SIMD explicit tvec4(T scalar);
+ GLM_FUNC_DECL GLM_CONSTEXPR_SIMD tvec4(T a, T b, T c, T d);
// -- Conversion scalar constructors --
diff --git a/3rdparty/glm/glm/detail/type_vec4.inl b/3rdparty/glm/glm/detail/type_vec4.inl
index 1694e8a418c..20f2b43cfb2 100644
--- a/3rdparty/glm/glm/detail/type_vec4.inl
+++ b/3rdparty/glm/glm/detail/type_vec4.inl
@@ -59,16 +59,16 @@ namespace glm
// -- Explicit basic constructors --
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4<T, P>::tvec4(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec4<T, P>::tvec4(ctor)
{}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4<T, P>::tvec4(T scalar)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4<T, P>::tvec4(T scalar)
: x(scalar), y(scalar), z(scalar), w(scalar)
{}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4<T, P>::tvec4(T a, T b, T c, T d)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4<T, P>::tvec4(T a, T b, T c, T d)
: x(a), y(b), z(c), w(d)
{}
diff --git a/3rdparty/glm/glm/detail/type_vec4_simd.inl b/3rdparty/glm/glm/detail/type_vec4_simd.inl
index 9dcb2158054..099c35eab83 100644
--- a/3rdparty/glm/glm/detail/type_vec4_simd.inl
+++ b/3rdparty/glm/glm/detail/type_vec4_simd.inl
@@ -36,7 +36,7 @@ namespace glm
# if !GLM_HAS_DEFAULTED_FUNCTIONS
template <>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4<float, simd>::tvec4()
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tvec4<float, simd>::tvec4()
# ifndef GLM_FORCE_NO_CTOR_INIT
: data(_mm_setzero_ps())
# endif
@@ -44,12 +44,12 @@ namespace glm
# endif//!GLM_HAS_DEFAULTED_FUNCTIONS
template <>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4<float, simd>::tvec4(float s) :
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4<float, simd>::tvec4(float s) :
data(_mm_set1_ps(s))
{}
template <>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4<float, simd>::tvec4(float a, float b, float c, float d) :
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4<float, simd>::tvec4(float a, float b, float c, float d) :
data(_mm_set_ps(d, c, b, a))
{}
diff --git a/3rdparty/glm/glm/gtc/quaternion.hpp b/3rdparty/glm/glm/gtc/quaternion.hpp
index 97abe5a0e59..c839752f1ad 100644
--- a/3rdparty/glm/glm/gtc/quaternion.hpp
+++ b/3rdparty/glm/glm/gtc/quaternion.hpp
@@ -89,7 +89,7 @@ namespace glm
// -- Explicit basic constructors --
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tquat(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tquat(ctor);
GLM_FUNC_DECL GLM_CONSTEXPR tquat(T const & s, tvec3<T, P> const & v);
GLM_FUNC_DECL GLM_CONSTEXPR tquat(T const & w, T const & x, T const & y, T const & z);
diff --git a/3rdparty/glm/glm/gtc/quaternion.inl b/3rdparty/glm/glm/gtc/quaternion.inl
index 7c9fc61158f..581b672e05a 100644
--- a/3rdparty/glm/glm/gtc/quaternion.inl
+++ b/3rdparty/glm/glm/gtc/quaternion.inl
@@ -98,7 +98,7 @@ namespace detail
// -- Explicit basic constructors --
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tquat<T, P>::tquat(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tquat<T, P>::tquat(ctor)
{}
template <typename T, precision P>
diff --git a/3rdparty/glm/glm/gtx/dual_quaternion.hpp b/3rdparty/glm/glm/gtx/dual_quaternion.hpp
index 32c49dda48a..4228a499981 100644
--- a/3rdparty/glm/glm/gtx/dual_quaternion.hpp
+++ b/3rdparty/glm/glm/gtx/dual_quaternion.hpp
@@ -88,7 +88,7 @@ namespace glm
// -- Explicit basic constructors --
- GLM_FUNC_DECL GLM_CONSTEXPR explicit tdualquat(ctor);
+ GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tdualquat(ctor);
GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, P> const & real);
GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, P> const & orientation, tvec3<T, P> const & translation);
GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, P> const & real, tquat<T, P> const & dual);
@@ -98,8 +98,8 @@ namespace glm
template <typename U, precision Q>
GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tdualquat(tdualquat<U, Q> const & q);
- GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tdualquat(tmat2x4<T, P> const & holder_mat);
- GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tdualquat(tmat3x4<T, P> const & aug_mat);
+ GLM_FUNC_DECL GLM_EXPLICIT tdualquat(tmat2x4<T, P> const & holder_mat);
+ GLM_FUNC_DECL GLM_EXPLICIT tdualquat(tmat3x4<T, P> const & aug_mat);
// -- Unary arithmetic operators --
diff --git a/3rdparty/glm/glm/gtx/dual_quaternion.inl b/3rdparty/glm/glm/gtx/dual_quaternion.inl
index ea1e618fb36..323c2b32dcc 100644
--- a/3rdparty/glm/glm/gtx/dual_quaternion.inl
+++ b/3rdparty/glm/glm/gtx/dual_quaternion.inl
@@ -87,7 +87,7 @@ namespace glm
// -- Explicit basic constructors --
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(ctor)
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tdualquat<T, P>::tdualquat(ctor)
{}
template <typename T, precision P>
@@ -119,13 +119,13 @@ namespace glm
{}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tmat2x4<T, P> const & m)
+ GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tmat2x4<T, P> const & m)
{
*this = dualquat_cast(m);
}
template <typename T, precision P>
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tmat3x4<T, P> const & m)
+ GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tmat3x4<T, P> const & m)
{
*this = dualquat_cast(m);
}