diff --git a/deps/glm/detail/func_common.hpp b/deps/glm/detail/func_common.hpp
index 41fe639d43..40674d9c74 100644
--- a/deps/glm/detail/func_common.hpp
+++ b/deps/glm/detail/func_common.hpp
@@ -53,7 +53,7 @@ namespace glm
/// @see GLSL abs man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType abs(genType const & x);
+ genType abs(genType const & x);
/// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0.
///
@@ -62,7 +62,7 @@ namespace glm
/// @see GLSL sign man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType sign(genType const & x);
+ genType sign(genType const & x);
/// Returns a value equal to the nearest integer that is less then or equal to x.
///
@@ -71,7 +71,7 @@ namespace glm
/// @see GLSL floor man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType floor(genType const & x);
+ genType floor(genType const & x);
/// Returns a value equal to the nearest integer to x
/// whose absolute value is not larger than the absolute value of x.
@@ -81,7 +81,7 @@ namespace glm
/// @see GLSL trunc man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType trunc(genType const & x);
+ genType trunc(genType const & x);
/// Returns a value equal to the nearest integer to x.
/// The fraction 0.5 will round in a direction chosen by the
@@ -94,7 +94,7 @@ namespace glm
/// @see GLSL round man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType round(genType const & x);
+ genType round(genType const & x);
/// Returns a value equal to the nearest integer to x.
/// A fractional part of 0.5 will round toward the nearest even
@@ -106,7 +106,7 @@ namespace glm
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
/// @see New round to even technique
template
- GLM_FUNC_DECL genType roundEven(genType const & x);
+ genType roundEven(genType const & x);
/// Returns a value equal to the nearest integer
/// that is greater than or equal to x.
@@ -116,7 +116,7 @@ namespace glm
/// @see GLSL ceil man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType ceil(genType const & x);
+ genType ceil(genType const & x);
/// Return x - floor(x).
///
@@ -125,7 +125,7 @@ namespace glm
/// @see GLSL fract man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType fract(genType const & x);
+ genType fract(genType const & x);
/// Modulus. Returns x - y * floor(x / y)
/// for each component in x using the floating point value y.
@@ -135,7 +135,7 @@ namespace glm
/// @see GLSL mod man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType mod(
+ genType mod(
genType const & x,
genType const & y);
@@ -147,7 +147,7 @@ namespace glm
/// @see GLSL mod man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType mod(
+ genType mod(
genType const & x,
typename genType::value_type const & y);
@@ -161,7 +161,7 @@ namespace glm
/// @see GLSL modf man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType modf(
+ genType modf(
genType const & x,
genType & i);
@@ -172,12 +172,12 @@ namespace glm
/// @see GLSL min man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions<<<<<<< HEAD
template
- GLM_FUNC_DECL genType min(
+ genType min(
genType const & x,
genType const & y);
template
- GLM_FUNC_DECL genType min(
+ genType min(
genType const & x,
typename genType::value_type const & y);
@@ -188,12 +188,12 @@ namespace glm
/// @see GLSL max man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType max(
+ genType max(
genType const & x,
genType const & y);
template
- GLM_FUNC_DECL genType max(
+ genType max(
genType const & x,
typename genType::value_type const & y);
@@ -205,13 +205,13 @@ namespace glm
/// @see GLSL clamp man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType clamp(
+ genType clamp(
genType const & x,
genType const & minVal,
genType const & maxVal);
template
- GLM_FUNC_DECL genType clamp(
+ genType clamp(
genType const & x,
typename genType::value_type const & minVal,
typename genType::value_type const & maxVal);
@@ -259,19 +259,19 @@ namespace glm
/// glm::vec4 u = glm::mix(g, h, r); // Interpolations can be perform per component with a vector for the last parameter.
/// @endcode
template class vecType>
- GLM_FUNC_DECL vecType mix(
+ vecType mix(
vecType const & x,
vecType const & y,
vecType const & a);
template class vecType>
- GLM_FUNC_DECL vecType mix(
+ vecType mix(
vecType const & x,
vecType const & y,
U const & a);
template
- GLM_FUNC_DECL genTypeT mix(
+ genTypeT mix(
genTypeT const & x,
genTypeT const & y,
genTypeU const & a);
@@ -281,7 +281,7 @@ namespace glm
/// @see GLSL step man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType step(
+ genType step(
genType const & edge,
genType const & x);
@@ -290,7 +290,7 @@ namespace glm
/// @see GLSL step man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template class vecType, typename T, precision P>
- GLM_FUNC_DECL vecType step(
+ vecType step(
T const & edge,
vecType const & x);
@@ -309,13 +309,13 @@ namespace glm
/// @see GLSL smoothstep man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType smoothstep(
+ genType smoothstep(
genType const & edge0,
genType const & edge1,
genType const & x);
template
- GLM_FUNC_DECL genType smoothstep(
+ genType smoothstep(
typename genType::value_type const & edge0,
typename genType::value_type const & edge1,
genType const & x);
@@ -333,7 +333,7 @@ namespace glm
/// @see GLSL isnan man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL typename genType::bool_type isnan(genType const & x);
+ typename genType::bool_type isnan(genType const & x);
/// Returns true if x holds a positive infinity or negative
/// infinity representation in the underlying implementation's
@@ -346,7 +346,7 @@ namespace glm
/// @see GLSL isinf man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL typename genType::bool_type isinf(genType const & x);
+ typename genType::bool_type isinf(genType const & x);
/// Returns a signed integer value representing
/// the encoding of a floating-point value. The floating-point
@@ -354,7 +354,7 @@ namespace glm
///
/// @see GLSL floatBitsToInt man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
- GLM_FUNC_DECL int floatBitsToInt(float const & v);
+ int floatBitsToInt(float const & v);
/// Returns a signed integer value representing
/// the encoding of a floating-point value. The floatingpoint
@@ -363,7 +363,7 @@ namespace glm
/// @see GLSL floatBitsToInt man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template class vecType, precision P>
- GLM_FUNC_DECL vecType floatBitsToInt(vecType const & v);
+ vecType floatBitsToInt(vecType const & v);
/// Returns a unsigned integer value representing
/// the encoding of a floating-point value. The floatingpoint
@@ -371,7 +371,7 @@ namespace glm
///
/// @see GLSL floatBitsToUint man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
- GLM_FUNC_DECL uint floatBitsToUint(float const & v);
+ uint floatBitsToUint(float const & v);
/// Returns a unsigned integer value representing
/// the encoding of a floating-point value. The floatingpoint
@@ -380,7 +380,7 @@ namespace glm
/// @see GLSL floatBitsToUint man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template class vecType, precision P>
- GLM_FUNC_DECL vecType floatBitsToUint(vecType const & v);
+ vecType floatBitsToUint(vecType const & v);
/// Returns a floating-point value corresponding to a signed
/// integer encoding of a floating-point value.
@@ -390,7 +390,7 @@ namespace glm
///
/// @see GLSL intBitsToFloat man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
- GLM_FUNC_DECL float intBitsToFloat(int const & v);
+ float intBitsToFloat(int const & v);
/// Returns a floating-point value corresponding to a signed
/// integer encoding of a floating-point value.
@@ -401,7 +401,7 @@ namespace glm
/// @see GLSL intBitsToFloat man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template class vecType, precision P>
- GLM_FUNC_DECL vecType intBitsToFloat(vecType const & v);
+ vecType intBitsToFloat(vecType const & v);
/// Returns a floating-point value corresponding to a
/// unsigned integer encoding of a floating-point value.
@@ -411,7 +411,7 @@ namespace glm
///
/// @see GLSL uintBitsToFloat man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
- GLM_FUNC_DECL float uintBitsToFloat(uint const & v);
+ float uintBitsToFloat(uint const & v);
/// Returns a floating-point value corresponding to a
/// unsigned integer encoding of a floating-point value.
@@ -422,7 +422,7 @@ namespace glm
/// @see GLSL uintBitsToFloat man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template class vecType, precision P>
- GLM_FUNC_DECL vecType uintBitsToFloat(vecType const & v);
+ vecType uintBitsToFloat(vecType const & v);
/// Computes and returns a * b + c.
///
@@ -431,7 +431,7 @@ namespace glm
/// @see GLSL fma man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType fma(genType const & a, genType const & b, genType const & c);
+ genType fma(genType const & a, genType const & b, genType const & c);
/// Splits x into a floating-point significand in the range
/// [0.5, 1.0) and an integral exponent of two, such that:
@@ -448,7 +448,7 @@ namespace glm
/// @see GLSL frexp man page
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType frexp(genType const & x, genIType & exp);
+ genType frexp(genType const & x, genIType & exp);
/// Builds a floating-point number from x and the
/// corresponding integral exponent of two in exp, returning:
@@ -462,7 +462,7 @@ namespace glm
/// @see GLSL ldexp man page;
/// @see GLSL 4.20.8 specification, section 8.3 Common Functions
template
- GLM_FUNC_DECL genType ldexp(genType const & x, genIType const & exp);
+ genType ldexp(genType const & x, genIType const & exp);
/// @}
}//namespace glm
diff --git a/deps/glm/detail/func_exponential.hpp b/deps/glm/detail/func_exponential.hpp
index d0a8928a75..779b4b81d2 100644
--- a/deps/glm/detail/func_exponential.hpp
+++ b/deps/glm/detail/func_exponential.hpp
@@ -56,7 +56,7 @@ namespace glm
/// @see GLSL pow man page
/// @see GLSL 4.20.8 specification, section 8.2 Exponential Functions
template
- GLM_FUNC_DECL genType pow(genType const & base, genType const & exponent);
+ genType pow(genType const & base, genType const & exponent);
/// Returns the natural exponentiation of x, i.e., e^x.
///
@@ -66,7 +66,7 @@ namespace glm
/// @see GLSL exp man page
/// @see GLSL 4.20.8 specification, section 8.2 Exponential Functions
template
- GLM_FUNC_DECL genType exp(genType const & x);
+ genType exp(genType const & x);
/// Returns the natural logarithm of x, i.e.,
/// returns the value y which satisfies the equation x = e^y.
@@ -78,7 +78,7 @@ namespace glm
/// @see GLSL log man page
/// @see GLSL 4.20.8 specification, section 8.2 Exponential Functions
template
- GLM_FUNC_DECL genType log(genType const & x);
+ genType log(genType const & x);
/// Returns 2 raised to the x power.
///
@@ -88,7 +88,7 @@ namespace glm
/// @see GLSL exp2 man page
/// @see GLSL 4.20.8 specification, section 8.2 Exponential Functions
template
- GLM_FUNC_DECL genType exp2(genType const & x);
+ genType exp2(genType const & x);
/// Returns the base 2 log of x, i.e., returns the value y,
/// which satisfies the equation x = 2 ^ y.
@@ -99,7 +99,7 @@ namespace glm
/// @see GLSL log2 man page
/// @see GLSL 4.20.8 specification, section 8.2 Exponential Functions
template
- GLM_FUNC_DECL genType log2(genType x);
+ genType log2(genType x);
/// Returns the positive square root of x.
///
@@ -109,10 +109,10 @@ namespace glm
/// @see GLSL sqrt man page
/// @see GLSL 4.20.8 specification, section 8.2 Exponential Functions
//template
- //GLM_FUNC_DECL genType sqrt(genType const & x);
+ // genType sqrt(genType const & x);
template class vecType>
- GLM_FUNC_DECL vecType sqrt(vecType const & x);
+ vecType sqrt(vecType const & x);
/// Returns the reciprocal of the positive square root of x.
///
@@ -122,7 +122,7 @@ namespace glm
/// @see GLSL inversesqrt man page
/// @see GLSL 4.20.8 specification, section 8.2 Exponential Functions
template
- GLM_FUNC_DECL genType inversesqrt(genType const & x);
+ genType inversesqrt(genType const & x);
/// @}
}//namespace glm
diff --git a/deps/glm/detail/func_geometric.hpp b/deps/glm/detail/func_geometric.hpp
index c2f5a89c97..19ef2d7f46 100644
--- a/deps/glm/detail/func_geometric.hpp
+++ b/deps/glm/detail/func_geometric.hpp
@@ -50,7 +50,7 @@ namespace glm
/// @see GLSL length man page
/// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions
template
- GLM_FUNC_DECL typename genType::value_type length(
+ typename genType::value_type length(
genType const & x);
/// Returns the distance betwwen p0 and p1, i.e., length(p0 - p1).
@@ -60,7 +60,7 @@ namespace glm
/// @see GLSL distance man page
/// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions
template
- GLM_FUNC_DECL typename genType::value_type distance(
+ typename genType::value_type distance(
genType const & p0,
genType const & p1);
@@ -71,7 +71,7 @@ namespace glm
/// @see GLSL dot man page
/// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions
template class vecType>
- GLM_FUNC_DECL T dot(
+ T dot(
vecType const & x,
vecType const & y);
@@ -82,7 +82,7 @@ namespace glm
/// @see GLSL dot man page
/// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions
template
- GLM_FUNC_DECL genType dot(
+ genType dot(
genType const & x,
genType const & y);
@@ -93,7 +93,7 @@ namespace glm
/// @see GLSL cross man page
/// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions
template
- GLM_FUNC_DECL detail::tvec3 cross(
+ detail::tvec3 cross(
detail::tvec3 const & x,
detail::tvec3 const & y);
@@ -102,7 +102,7 @@ namespace glm
/// @see GLSL normalize man page
/// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions
template
- GLM_FUNC_DECL genType normalize(
+ genType normalize(
genType const & x);
/// If dot(Nref, I) < 0.0, return N, otherwise, return -N.
@@ -112,7 +112,7 @@ namespace glm
/// @see GLSL faceforward man page
/// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions
template
- GLM_FUNC_DECL genType faceforward(
+ genType faceforward(
genType const & N,
genType const & I,
genType const & Nref);
@@ -125,7 +125,7 @@ namespace glm
/// @see GLSL reflect man page
/// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions
template
- GLM_FUNC_DECL genType reflect(
+ genType reflect(
genType const & I,
genType const & N);
@@ -138,7 +138,7 @@ namespace glm
/// @see GLSL refract man page
/// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions
template class vecType>
- GLM_FUNC_DECL vecType refract(
+ vecType refract(
vecType const & I,
vecType const & N,
T const & eta);
diff --git a/deps/glm/detail/func_integer.hpp b/deps/glm/detail/func_integer.hpp
index 774aca8fac..f4270486eb 100644
--- a/deps/glm/detail/func_integer.hpp
+++ b/deps/glm/detail/func_integer.hpp
@@ -54,7 +54,7 @@ namespace glm
/// @see GLSL uaddCarry man page
/// @see GLSL 4.20.8 specification, section 8.8 Integer Functions
template
- GLM_FUNC_DECL genUType uaddCarry(
+ genUType uaddCarry(
genUType const & x,
genUType const & y,
genUType & carry);
@@ -68,7 +68,7 @@ namespace glm
/// @see GLSL usubBorrow man page
/// @see GLSL 4.20.8 specification, section 8.8 Integer Functions
template
- GLM_FUNC_DECL genUType usubBorrow(
+ genUType usubBorrow(
genUType const & x,
genUType const & y,
genUType & borrow);
@@ -82,7 +82,7 @@ namespace glm
/// @see GLSL umulExtended man page
/// @see GLSL 4.20.8 specification, section 8.8 Integer Functions
template
- GLM_FUNC_DECL void umulExtended(
+ void umulExtended(
genUType const & x,
genUType const & y,
genUType & msb,
@@ -97,7 +97,7 @@ namespace glm
/// @see GLSL imulExtended man page
/// @see GLSL 4.20.8 specification, section 8.8 Integer Functions
template
- GLM_FUNC_DECL void imulExtended(
+ void imulExtended(
genIType const & x,
genIType const & y,
genIType & msb,
@@ -119,7 +119,7 @@ namespace glm
/// @see GLSL bitfieldExtract man page
/// @see GLSL 4.20.8 specification, section 8.8 Integer Functions
template
- GLM_FUNC_DECL genIUType bitfieldExtract(
+ genIUType bitfieldExtract(
genIUType const & Value,
int const & Offset,
int const & Bits);
@@ -139,7 +139,7 @@ namespace glm
/// @see GLSL bitfieldInsert man page
/// @see GLSL 4.20.8 specification, section 8.8 Integer Functions
template
- GLM_FUNC_DECL genIUType bitfieldInsert(
+ genIUType bitfieldInsert(
genIUType const & Base,
genIUType const & Insert,
int const & Offset,
@@ -154,7 +154,7 @@ namespace glm
/// @see GLSL bitfieldReverse man page
/// @see GLSL 4.20.8 specification, section 8.8 Integer Functions
template
- GLM_FUNC_DECL genIUType bitfieldReverse(genIUType const & Value);
+ genIUType bitfieldReverse(genIUType const & Value);
/// Returns the number of bits set to 1 in the binary representation of value.
///
@@ -165,7 +165,7 @@ namespace glm
///
/// @todo Clarify the declaration to specify that scalars are suported.
template class genIUType>
- GLM_FUNC_DECL typename genIUType::signed_type bitCount(genIUType const & Value);
+ typename genIUType::signed_type bitCount(genIUType const & Value);
/// Returns the bit number of the least significant bit set to
/// 1 in the binary representation of value.
@@ -178,7 +178,7 @@ namespace glm
///
/// @todo Clarify the declaration to specify that scalars are suported.
template class genIUType>
- GLM_FUNC_DECL typename genIUType::signed_type findLSB(genIUType const & Value);
+ typename genIUType::signed_type findLSB(genIUType const & Value);
/// Returns the bit number of the most significant bit in the binary representation of value.
/// For positive integers, the result will be the bit number of the most significant bit set to 1.
@@ -192,7 +192,7 @@ namespace glm
///
/// @todo Clarify the declaration to specify that scalars are suported.
template class genIUType>
- GLM_FUNC_DECL typename genIUType::signed_type findMSB(genIUType const & Value);
+ typename genIUType::signed_type findMSB(genIUType const & Value);
/// @}
}//namespace glm
diff --git a/deps/glm/detail/func_matrix.hpp b/deps/glm/detail/func_matrix.hpp
index d9a4f78e1b..85a4f7e1e3 100644
--- a/deps/glm/detail/func_matrix.hpp
+++ b/deps/glm/detail/func_matrix.hpp
@@ -127,7 +127,7 @@ namespace detail
/// @see GLSL matrixCompMult man page
/// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
template class matType>
- GLM_FUNC_DECL matType matrixCompMult(matType const & x, matType const & y);
+ matType matrixCompMult(matType const & x, matType const & y);
/// Treats the first parameter c as a column vector
/// and the second parameter r as a row vector
@@ -140,7 +140,7 @@ namespace detail
///
/// @todo Clarify the declaration to specify that matType doesn't have to be provided when used.
template class vecTypeA, template class vecTypeB>
- GLM_FUNC_DECL typename detail::outerProduct_trait::type outerProduct(vecTypeA const & c, vecTypeB const & r);
+ typename detail::outerProduct_trait::type outerProduct(vecTypeA const & c, vecTypeB const & r);
/// Returns the transposed matrix of x
///
@@ -150,7 +150,7 @@ namespace detail
/// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
# if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC11))
template class matType>
- GLM_FUNC_DECL typename matType::transpose_type transpose(matType const & x);
+ typename matType::transpose_type transpose(matType const & x);
# endif
/// Return the determinant of a squared matrix.
@@ -160,7 +160,7 @@ namespace detail
/// @see GLSL determinant man page
/// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
template class matType>
- GLM_FUNC_DECL T determinant(matType const & m);
+ T determinant(matType const & m);
/// Return the inverse of a squared matrix.
///
@@ -169,7 +169,7 @@ namespace detail
/// @see GLSL inverse man page
/// @see GLSL 4.20.8 specification, section 8.6 Matrix Functions
template class matType>
- GLM_FUNC_DECL matType inverse(matType const & m);
+ matType inverse(matType const & m);
/// @}
}//namespace glm
diff --git a/deps/glm/detail/func_noise.hpp b/deps/glm/detail/func_noise.hpp
index ffb0f933bb..08893a4e2c 100644
--- a/deps/glm/detail/func_noise.hpp
+++ b/deps/glm/detail/func_noise.hpp
@@ -55,7 +55,7 @@ namespace glm
/// @see GLSL noise1 man page
/// @see GLSL 4.20.8 specification, section 8.13 Noise Functions
template
- GLM_FUNC_DECL typename genType::value_type noise1(genType const & x);
+ typename genType::value_type noise1(genType const & x);
/// Returns a 2D noise value based on the input value x.
///
@@ -64,7 +64,7 @@ namespace glm
/// @see GLSL noise2 man page
/// @see GLSL 4.20.8 specification, section 8.13 Noise Functions
template
- GLM_FUNC_DECL detail::tvec2 noise2(genType const & x);
+ detail::tvec2 noise2(genType const & x);
/// Returns a 3D noise value based on the input value x.
///
@@ -73,7 +73,7 @@ namespace glm
/// @see GLSL noise3 man page
/// @see GLSL 4.20.8 specification, section 8.13 Noise Functions
template
- GLM_FUNC_DECL detail::tvec3 noise3(genType const & x);
+ detail::tvec3 noise3(genType const & x);
/// Returns a 4D noise value based on the input value x.
///
@@ -82,7 +82,7 @@ namespace glm
/// @see GLSL noise4 man page
/// @see GLSL 4.20.8 specification, section 8.13 Noise Functions
template
- GLM_FUNC_DECL detail::tvec4 noise4(genType const & x);
+ detail::tvec4 noise4(genType const & x);
/// @}
}//namespace glm
diff --git a/deps/glm/detail/func_packing.hpp b/deps/glm/detail/func_packing.hpp
index 7eaa2706d0..0487ec0836 100644
--- a/deps/glm/detail/func_packing.hpp
+++ b/deps/glm/detail/func_packing.hpp
@@ -55,7 +55,7 @@ namespace glm
///
/// @see GLSL packUnorm2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL uint packUnorm2x16(vec2 const & v);
+ uint packUnorm2x16(vec2 const & v);
/// First, converts each component of the normalized floating-point value v into 8- or 16-bit integer values.
/// Then, the results are packed into the returned 32-bit unsigned integer.
@@ -68,7 +68,7 @@ namespace glm
///
/// @see GLSL packSnorm2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL uint packSnorm2x16(vec2 const & v);
+ uint packSnorm2x16(vec2 const & v);
/// First, converts each component of the normalized floating-point value v into 8- or 16-bit integer values.
/// Then, the results are packed into the returned 32-bit unsigned integer.
@@ -81,7 +81,7 @@ namespace glm
///
/// @see GLSL packUnorm4x8 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL uint packUnorm4x8(vec4 const & v);
+ uint packUnorm4x8(vec4 const & v);
/// First, converts each component of the normalized floating-point value v into 8- or 16-bit integer values.
/// Then, the results are packed into the returned 32-bit unsigned integer.
@@ -94,7 +94,7 @@ namespace glm
///
/// @see GLSL packSnorm4x8 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL uint packSnorm4x8(vec4 const & v);
+ uint packSnorm4x8(vec4 const & v);
/// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
/// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
@@ -107,7 +107,7 @@ namespace glm
///
/// @see GLSL unpackUnorm2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL vec2 unpackUnorm2x16(uint const & p);
+ vec2 unpackUnorm2x16(uint const & p);
/// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
/// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
@@ -120,7 +120,7 @@ namespace glm
///
/// @see GLSL unpackSnorm2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL vec2 unpackSnorm2x16(uint const & p);
+ vec2 unpackSnorm2x16(uint const & p);
/// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
/// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
@@ -133,7 +133,7 @@ namespace glm
///
/// @see GLSL unpackUnorm4x8 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL vec4 unpackUnorm4x8(uint const & p);
+ vec4 unpackUnorm4x8(uint const & p);
/// First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
/// Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
@@ -146,7 +146,7 @@ namespace glm
///
/// @see GLSL unpackSnorm4x8 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL vec4 unpackSnorm4x8(uint const & p);
+ vec4 unpackSnorm4x8(uint const & p);
/// Returns a double-precision value obtained by packing the components of v into a 64-bit value.
/// If an IEEE 754 Inf or NaN is created, it will not signal, and the resulting floating point value is unspecified.
@@ -156,7 +156,7 @@ namespace glm
///
/// @see GLSL packDouble2x32 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL double packDouble2x32(uvec2 const & v);
+ double packDouble2x32(uvec2 const & v);
/// Returns a two-component unsigned integer vector representation of v.
/// The bit-level representation of v is preserved.
@@ -165,7 +165,7 @@ namespace glm
///
/// @see GLSL unpackDouble2x32 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL uvec2 unpackDouble2x32(double const & v);
+ uvec2 unpackDouble2x32(double const & v);
/// Returns an unsigned integer obtained by converting the components of a two-component floating-point vector
/// to the 16-bit floating-point representation found in the OpenGL Specification,
@@ -175,7 +175,7 @@ namespace glm
///
/// @see GLSL packHalf2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL uint packHalf2x16(vec2 const & v);
+ uint packHalf2x16(vec2 const & v);
/// Returns a two-component floating-point vector with components obtained by unpacking a 32-bit unsigned integer into a pair of 16-bit values,
/// interpreting those values as 16-bit floating-point numbers according to the OpenGL Specification,
@@ -185,7 +185,7 @@ namespace glm
///
/// @see GLSL unpackHalf2x16 man page
/// @see GLSL 4.20.8 specification, section 8.4 Floating-Point Pack and Unpack Functions
- GLM_FUNC_DECL vec2 unpackHalf2x16(uint const & v);
+ vec2 unpackHalf2x16(uint const & v);
/// @}
}//namespace glm
diff --git a/deps/glm/detail/func_trigonometric.hpp b/deps/glm/detail/func_trigonometric.hpp
index e28185c4da..11d89b9fef 100644
--- a/deps/glm/detail/func_trigonometric.hpp
+++ b/deps/glm/detail/func_trigonometric.hpp
@@ -52,7 +52,7 @@ namespace glm
/// @see GLSL radians man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType radians(genType const & degrees);
+ genType radians(genType const & degrees);
/// Converts radians to degrees and returns the result.
///
@@ -61,7 +61,7 @@ namespace glm
/// @see GLSL degrees man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType degrees(genType const & radians);
+ genType degrees(genType const & radians);
/// The standard trigonometric sine function.
/// The values returned by this function will range from [-1, 1].
@@ -71,7 +71,7 @@ namespace glm
/// @see GLSL sin man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType sin(genType const & angle);
+ genType sin(genType const & angle);
/// The standard trigonometric cosine function.
/// The values returned by this function will range from [-1, 1].
@@ -81,7 +81,7 @@ namespace glm
/// @see GLSL cos man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType cos(genType const & angle);
+ genType cos(genType const & angle);
/// The standard trigonometric tangent function.
///
@@ -90,7 +90,7 @@ namespace glm
/// @see GLSL tan man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType tan(genType const & angle);
+ genType tan(genType const & angle);
/// Arc sine. Returns an angle whose sine is x.
/// The range of values returned by this function is [-PI/2, PI/2].
@@ -101,7 +101,7 @@ namespace glm
/// @see GLSL asin man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType asin(genType const & x);
+ genType asin(genType const & x);
/// Arc cosine. Returns an angle whose sine is x.
/// The range of values returned by this function is [0, PI].
@@ -112,7 +112,7 @@ namespace glm
/// @see GLSL acos man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType acos(genType const & x);
+ genType acos(genType const & x);
/// Arc tangent. Returns an angle whose tangent is y/x.
/// The signs of x and y are used to determine what
@@ -125,7 +125,7 @@ namespace glm
/// @see GLSL atan man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType atan(genType const & y, genType const & x);
+ genType atan(genType const & y, genType const & x);
/// Arc tangent. Returns an angle whose tangent is y_over_x.
/// The range of values returned by this function is [-PI/2, PI/2].
@@ -135,7 +135,7 @@ namespace glm
/// @see GLSL atan man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType atan(genType const & y_over_x);
+ genType atan(genType const & y_over_x);
/// Returns the hyperbolic sine function, (exp(x) - exp(-x)) / 2
///
@@ -144,7 +144,7 @@ namespace glm
/// @see GLSL sinh man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType sinh(genType const & angle);
+ genType sinh(genType const & angle);
/// Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2
///
@@ -153,7 +153,7 @@ namespace glm
/// @see GLSL cosh man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType cosh(genType const & angle);
+ genType cosh(genType const & angle);
/// Returns the hyperbolic tangent function, sinh(angle) / cosh(angle)
///
@@ -162,7 +162,7 @@ namespace glm
/// @see GLSL tanh man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType tanh(genType const & angle);
+ genType tanh(genType const & angle);
/// Arc hyperbolic sine; returns the inverse of sinh.
///
@@ -171,7 +171,7 @@ namespace glm
/// @see GLSL asinh man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType asinh(genType const & x);
+ genType asinh(genType const & x);
/// Arc hyperbolic cosine; returns the non-negative inverse
/// of cosh. Results are undefined if x < 1.
@@ -181,7 +181,7 @@ namespace glm
/// @see GLSL acosh man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType acosh(genType const & x);
+ genType acosh(genType const & x);
/// Arc hyperbolic tangent; returns the inverse of tanh.
/// Results are undefined if abs(x) >= 1.
@@ -191,7 +191,7 @@ namespace glm
/// @see GLSL atanh man page
/// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions
template
- GLM_FUNC_DECL genType atanh(genType const & x);
+ genType atanh(genType const & x);
/// @}
}//namespace glm
diff --git a/deps/glm/detail/func_vector_relational.hpp b/deps/glm/detail/func_vector_relational.hpp
index ba7d5efd88..8bef6dd90a 100644
--- a/deps/glm/detail/func_vector_relational.hpp
+++ b/deps/glm/detail/func_vector_relational.hpp
@@ -59,7 +59,7 @@ namespace glm
/// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions
// TODO: Mismatched
//template class vecType>
- //GLM_FUNC_DECL typename vecType::bool_type lessThan(vecType const & x, vecType const & y);
+ //typename vecType::bool_type lessThan(vecType const & x, vecType const & y);
/// Returns the component-wise comparison of result x <= y.
///
@@ -68,7 +68,7 @@ namespace glm
/// @see GLSL lessThanEqual man page
/// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions
template class vecType>
- GLM_FUNC_DECL typename vecType::bool_type lessThanEqual(vecType const & x, vecType const & y);
+ typename vecType::bool_type lessThanEqual(vecType const & x, vecType const & y);
/// Returns the component-wise comparison of result x > y.
///
@@ -77,7 +77,7 @@ namespace glm
/// @see GLSL greaterThan man page
/// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions
template class vecType>
- GLM_FUNC_DECL typename vecType::bool_type greaterThan(vecType const & x, vecType const & y);
+ typename vecType::bool_type greaterThan(vecType const & x, vecType const & y);
/// Returns the component-wise comparison of result x >= y.
///
@@ -86,7 +86,7 @@ namespace glm
/// @see GLSL greaterThanEqual man page
/// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions
template class vecType>
- GLM_FUNC_DECL typename vecType::bool_type greaterThanEqual(vecType const & x, vecType const & y);
+ typename vecType::bool_type greaterThanEqual(vecType const & x, vecType const & y);
/// Returns the component-wise comparison of result x == y.
///
@@ -96,7 +96,7 @@ namespace glm
/// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions
//TODO: conflicts with definision
//template class vecType>
- //GLM_FUNC_DECL typename vecType::bool_type equal(vecType const & x, vecType const & y);
+ //typename vecType::bool_type equal(vecType const & x, vecType const & y);
/// Returns the component-wise comparison of result x != y.
///
@@ -105,7 +105,7 @@ namespace glm
/// @see GLSL notEqual man page
/// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions
template class vecType>
- GLM_FUNC_DECL typename vecType::bool_type notEqual(vecType const & x, vecType const & y);
+ typename vecType::bool_type notEqual(vecType const & x, vecType const & y);
/// Returns true if any component of x is true.
///
@@ -114,7 +114,7 @@ namespace glm
/// @see GLSL any man page
/// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions
template class vecType>
- GLM_FUNC_DECL bool any(vecType const & v);
+ bool any(vecType const & v);
/// Returns true if all components of x are true.
///
@@ -123,7 +123,7 @@ namespace glm
/// @see GLSL all man page
/// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions
template class vecType>
- GLM_FUNC_DECL bool all(vecType const & v);
+ bool all(vecType const & v);
/// Returns the component-wise logical complement of x.
/// /!\ Because of language incompatibilities between C++ and GLSL, GLM defines the function not but not_ instead.
@@ -133,7 +133,7 @@ namespace glm
/// @see GLSL not man page
/// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions
template class vecType>
- GLM_FUNC_DECL vecType not_(vecType const & v);
+ vecType not_(vecType const & v);
/// @}
}//namespace glm
diff --git a/deps/glm/detail/setup.hpp b/deps/glm/detail/setup.hpp
index 49a6b86aec..2c2d1a473c 100644
--- a/deps/glm/detail/setup.hpp
+++ b/deps/glm/detail/setup.hpp
@@ -665,8 +665,7 @@
# define GLM_INLINE inline
#endif//defined(GLM_FORCE_INLINE)
-#define GLM_FUNC_DECL GLM_CUDA_FUNC_DECL
-#define GLM_FUNC_QUALIFIER GLM_CUDA_FUNC_DEF GLM_INLINE
+#define GLM_FUNC_QUALIFIER GLM_INLINE
///////////////////////////////////////////////////////////////////////////////////////////////////
// Swizzle operators
diff --git a/deps/glm/detail/type_half.hpp b/deps/glm/detail/type_half.hpp
index 61f4594e5a..afe2396fc0 100644
--- a/deps/glm/detail/type_half.hpp
+++ b/deps/glm/detail/type_half.hpp
@@ -34,8 +34,8 @@
namespace glm{
namespace detail
{
- GLM_FUNC_DECL float toFloat32(int16_t value);
- GLM_FUNC_DECL int16_t toFloat16(float const & value);
+ float toFloat32(int16_t value);
+ int16_t toFloat16(float const & value);
}//namespace detail
}//namespace glm
diff --git a/deps/glm/detail/type_mat2x2.hpp b/deps/glm/detail/type_mat2x2.hpp
index 921fc0e24b..bdbad272d0 100644
--- a/deps/glm/detail/type_mat2x2.hpp
+++ b/deps/glm/detail/type_mat2x2.hpp
@@ -48,7 +48,7 @@ namespace detail
typedef tmat2x2 type;
typedef tmat2x2 transpose_type;
- GLM_FUNC_DECL length_t length() const;
+ length_t length() const;
template
friend tvec2 operator/(tmat2x2 const & m, tvec2 const & v);
@@ -63,181 +63,181 @@ namespace detail
public:
//////////////////////////////////////
// Constructors
- GLM_FUNC_DECL tmat2x2();
- GLM_FUNC_DECL tmat2x2(tmat2x2 const & m);
+ tmat2x2();
+ tmat2x2(tmat2x2 const & m);
template
- GLM_FUNC_DECL tmat2x2(tmat2x2 const & m);
+ tmat2x2(tmat2x2 const & m);
- GLM_FUNC_DECL explicit tmat2x2(
+ explicit tmat2x2(
ctor Null);
- GLM_FUNC_DECL explicit tmat2x2(
+ explicit tmat2x2(
T const & x);
- GLM_FUNC_DECL tmat2x2(
+ tmat2x2(
T const & x1, T const & y1,
T const & x2, T const & y2);
- GLM_FUNC_DECL tmat2x2(
+ tmat2x2(
col_type const & v1,
col_type const & v2);
//////////////////////////////////////
// Conversions
template
- GLM_FUNC_DECL tmat2x2(
+ tmat2x2(
U const & x1, V const & y1,
M const & x2, N const & y2);
template
- GLM_FUNC_DECL tmat2x2(
+ tmat2x2(
tvec2 const & v1,
tvec2 const & v2);
//////////////////////////////////////
// Matrix conversions
template
- GLM_FUNC_DECL explicit tmat2x2(tmat2x2 const & m);
+ explicit tmat2x2(tmat2x2 const & m);
- GLM_FUNC_DECL explicit tmat2x2(tmat3x3 const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat4x4 const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat2x3 const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat3x2 const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat2x4 const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat4x2 const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat3x4 const & x);
- GLM_FUNC_DECL explicit tmat2x2(tmat4x3 const & x);
+ explicit tmat2x2(tmat3x3 const & x);
+ explicit tmat2x2(tmat4x4 const & x);
+ explicit tmat2x2(tmat2x3 const & x);
+ explicit tmat2x2(tmat3x2 const & x);
+ explicit tmat2x2(tmat2x4 const & x);
+ explicit tmat2x2(tmat4x2 const & x);
+ explicit tmat2x2(tmat3x4 const & x);
+ explicit tmat2x2(tmat4x3