Refactor headers

glm/detail/func_packing.inl

@@ -11,11 +11,11 @@ namespace glm
 	{
 		union
 		{
-			u16  in[2];
+			unsigned short in[2];
 			uint out;
 		} u;
 
-		u16vec2 result(round(clamp(v, 0.0f, 1.0f) * 65535.0f));
+		vec<2, unsigned short, defaultp> result(round(clamp(v, 0.0f, 1.0f) * 65535.0f));
 
 		u.in[0] = result[0];
 		u.in[1] = result[1];
@@ -28,7 +28,7 @@ namespace glm
 		union
 		{
 			uint in;
-			u16  out[2];
+			unsigned short out[2];
 		} u;
 
 		u.in = p;
@@ -40,11 +40,11 @@ namespace glm
 	{
 		union
 		{
-			i16  in[2];
+			signed short in[2];
 			uint out;
 		} u;
-
-		i16vec2 result(round(clamp(v, -1.0f, 1.0f) * 32767.0f));
+ 
+		vec<2, short, defaultp> result(round(clamp(v, -1.0f, 1.0f) * 32767.0f));
 
 		u.in[0] = result[0];
 		u.in[1] = result[1];
@@ -57,7 +57,7 @@ namespace glm
 		union
 		{
 			uint in;
-			i16  out[2];
+			signed short out[2];
 		} u;
 
 		u.in = p;
@@ -69,11 +69,11 @@ namespace glm
 	{
 		union
 		{
-			u8   in[4];
+			unsigned char in[4];
 			uint out;
 		} u;
 
-		u8vec4 result(round(clamp(v, 0.0f, 1.0f) * 255.0f));
+		vec<4, unsigned char, defaultp> result(round(clamp(v, 0.0f, 1.0f) * 255.0f));
 
 		u.in[0] = result[0];
 		u.in[1] = result[1];
@@ -88,7 +88,7 @@ namespace glm
 		union
 		{
 			uint in;
-			u8   out[4];
+			unsigned char out[4];
 		} u;
 
 		u.in = p;
@@ -100,11 +100,11 @@ namespace glm
 	{
 		union
 		{
-			i8   in[4];
+			signed char in[4];
 			uint out;
 		} u;
 
-		i8vec4 result(round(clamp(v, -1.0f, 1.0f) * 127.0f));
+		vec<4, signed char, defaultp> result(round(clamp(v, -1.0f, 1.0f) * 127.0f));
 
 		u.in[0] = result[0];
 		u.in[1] = result[1];
@@ -119,7 +119,7 @@ namespace glm
 		union
 		{
 			uint in;
-			i8   out[4];
+			signed char out[4];
 		} u;
 
 		u.in = p;
@@ -158,7 +158,7 @@ namespace glm
 	{
 		union
 		{
-			i16  in[2];
+			signed short in[2];
 			uint out;
 		} u;
 
@@ -173,7 +173,7 @@ namespace glm
 		union
 		{
 			uint in;
-			i16  out[2];
+			signed short out[2];
 		} u;
 
 		u.in = v;

glm/detail/type_half.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_half.inl
 
 namespace glm{
 namespace detail

glm/detail/type_mat.hpp

@@ -1,720 +0,0 @@
-/// @ref core
-/// @file glm/detail/type_mat.hpp
-
-#pragma once
-
-#include "qualifier.hpp"
-
-namespace glm{
-namespace detail
-{
-	template<length_t C, length_t R, typename T, qualifier Q>
-	struct outerProduct_trait{};
-}//namespace detail
-
-#if GLM_HAS_TEMPLATE_ALIASES
-	template <typename T, qualifier Q = defaultp> using tmat2x2 = mat<2, 2, T, Q>;
-	template <typename T, qualifier Q = defaultp> using tmat2x3 = mat<2, 3, T, Q>;
-	template <typename T, qualifier Q = defaultp> using tmat2x4 = mat<2, 4, T, Q>;
-	template <typename T, qualifier Q = defaultp> using tmat3x2 = mat<3, 2, T, Q>;
-	template <typename T, qualifier Q = defaultp> using tmat3x3 = mat<3, 3, T, Q>;
-	template <typename T, qualifier Q = defaultp> using tmat3x4 = mat<3, 4, T, Q>;
-	template <typename T, qualifier Q = defaultp> using tmat4x2 = mat<4, 2, T, Q>;
-	template <typename T, qualifier Q = defaultp> using tmat4x3 = mat<4, 3, T, Q>;
-	template <typename T, qualifier Q = defaultp> using tmat4x4 = mat<4, 4, T, Q>;
-#endif//GLM_HAS_TEMPLATE_ALIASES
-
-	template<length_t C, length_t R, typename T, qualifier Q>
-	GLM_FUNC_DECL mat<C, R, T, Q> inverse(mat<C, R, T, Q> const& m);
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 2 columns of 2 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 2, float, lowp>		lowp_mat2;
-
-	/// 2 columns of 2 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 2, float, mediump>	mediump_mat2;
-
-	/// 2 columns of 2 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 2, float, highp>		highp_mat2;
-
-	/// 2 columns of 2 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 2, float, lowp>		lowp_mat2x2;
-
-	/// 2 columns of 2 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 2, float, mediump>	mediump_mat2x2;
-
-	/// 2 columns of 2 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 2, float, highp>		highp_mat2x2;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 2 columns of 3 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 3, float, lowp>		lowp_mat2x3;
-
-	/// 2 columns of 3 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 3, float, mediump>	mediump_mat2x3;
-
-	/// 2 columns of 3 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 3, float, highp>		highp_mat2x3;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 2 columns of 4 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 4, float, lowp>		lowp_mat2x4;
-
-	/// 2 columns of 4 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 4, float, mediump>	mediump_mat2x4;
-
-	/// 2 columns of 4 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 4, float, highp>		highp_mat2x4;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 3 columns of 2 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 2, float, lowp>		lowp_mat3x2;
-
-	/// 3 columns of 2 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 2, float, mediump>	mediump_mat3x2;
-
-	/// 3 columns of 2 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 2, float, highp>		highp_mat3x2;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 3 columns of 3 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, float, lowp>		lowp_mat3;
-
-	/// 3 columns of 3 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, float, mediump>	mediump_mat3;
-
-	/// 3 columns of 3 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, float, highp>		highp_mat3;
-
-	/// 3 columns of 3 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, float, lowp>		lowp_mat3x3;
-
-	/// 3 columns of 3 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, float, mediump>	mediump_mat3x3;
-
-	/// 3 columns of 3 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, float, highp>		highp_mat3x3;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 3 columns of 4 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 4, float, lowp>		lowp_mat3x4;
-
-	/// 3 columns of 4 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 4, float, mediump>	mediump_mat3x4;
-
-	/// 3 columns of 4 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 4, float, highp>		highp_mat3x4;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 4 columns of 2 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 2, float, lowp>		lowp_mat4x2;
-
-	/// 4 columns of 2 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 2, float, mediump>	mediump_mat4x2;
-
-	/// 4 columns of 2 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 2, float, highp>		highp_mat4x2;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 4 columns of 3 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 3, float, lowp>		lowp_mat4x3;
-
-	/// 4 columns of 3 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 3, float, mediump>	mediump_mat4x3;
-
-	/// 4 columns of 3 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 3, float, highp>		highp_mat4x3;
-
-	/// @}
-
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 4 columns of 4 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, float, lowp>		lowp_mat4;
-
-	/// 4 columns of 4 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, float, mediump>	mediump_mat4;
-
-	/// 4 columns of 4 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, float, highp>		highp_mat4;
-
-	/// 4 columns of 4 components matrix of low qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, float, lowp>		lowp_mat4x4;
-
-	/// 4 columns of 4 components matrix of medium qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, float, mediump>	mediump_mat4x4;
-
-	/// 4 columns of 4 components matrix of high qualifier floating-point numbers.
-	/// There is no guarantee on the actual qualifier.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, float, highp>		highp_mat4x4;
-
-	/// @}
-
-	/// @addtogroup core_types
-	/// @{
-
-	//////////////////////////
-	// Float definition
-
-#if(defined(GLM_PRECISION_LOWP_FLOAT))
-	typedef lowp_mat2x2			mat2x2;
-	typedef lowp_mat2x3			mat2x3;
-	typedef lowp_mat2x4			mat2x4;
-	typedef lowp_mat3x2			mat3x2;
-	typedef lowp_mat3x3			mat3x3;
-	typedef lowp_mat3x4			mat3x4;
-	typedef lowp_mat4x2			mat4x2;
-	typedef lowp_mat4x3			mat4x3;
-	typedef lowp_mat4x4			mat4x4;
-#elif(defined(GLM_PRECISION_MEDIUMP_FLOAT))
-	typedef mediump_mat2x2		mat2x2;
-	typedef mediump_mat2x3		mat2x3;
-	typedef mediump_mat2x4		mat2x4;
-	typedef mediump_mat3x2		mat3x2;
-	typedef mediump_mat3x3		mat3x3;
-	typedef mediump_mat3x4		mat3x4;
-	typedef mediump_mat4x2		mat4x2;
-	typedef mediump_mat4x3		mat4x3;
-	typedef mediump_mat4x4		mat4x4;
-#else
-	/// 2 columns of 2 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_mat2x2			mat2x2;
-
-	//! 2 columns of 3 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_mat2x3			mat2x3;
-
-	//! 2 columns of 4 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_mat2x4			mat2x4;
-
-	//! 3 columns of 2 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_mat3x2			mat3x2;
-
-	//! 3 columns of 3 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_mat3x3			mat3x3;
-
-	//! 3 columns of 4 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_mat3x4			mat3x4;
-
-	//! 4 columns of 2 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_mat4x2			mat4x2;
-
-	//! 4 columns of 3 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_mat4x3			mat4x3;
-
-	//! 4 columns of 4 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_mat4x4			mat4x4;
-
-#endif//GLM_PRECISION
-
-	//! 3 columns of 3 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef mat3x3					mat3;
-
-	//! 4 columns of 4 components matrix of floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef mat4x4					mat4;
-
-	//////////////////////////
-	// Double definition
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 2 columns of 3 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 3, double, lowp>		lowp_dmat2x3;
-
-	/// 2 columns of 3 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 3, double, mediump>	mediump_dmat2x3;
-
-	/// 2 columns of 3 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 3, double, highp>		highp_dmat2x3;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 2 columns of 4 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 4, double, lowp>		lowp_dmat2x4;
-
-	/// 2 columns of 4 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 4, double, mediump>	mediump_dmat2x4;
-
-	/// 2 columns of 4 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<2, 4, double, highp>		highp_dmat2x4;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 3 columns of 2 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 2, double, lowp>		lowp_dmat3x2;
-
-	/// 3 columns of 2 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 2, double, mediump>	mediump_dmat3x2;
-
-	/// 3 columns of 2 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 2, double, highp>		highp_dmat3x2;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 3 columns of 3 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, float, lowp>		lowp_dmat3;
-
-	/// 3 columns of 3 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, double, mediump>	mediump_dmat3;
-
-	/// 3 columns of 3 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, double, highp>		highp_dmat3;
-
-	/// 3 columns of 3 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, double, lowp>		lowp_dmat3x3;
-
-	/// 3 columns of 3 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, double, mediump>	mediump_dmat3x3;
-
-	/// 3 columns of 3 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 3, double, highp>		highp_dmat3x3;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 3 columns of 4 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 4, double, lowp>		lowp_dmat3x4;
-
-	/// 3 columns of 4 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 4, double, mediump>	mediump_dmat3x4;
-
-	/// 3 columns of 4 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<3, 4, double, highp>		highp_dmat3x4;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 4 columns of 2 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 2, double, lowp>		lowp_dmat4x2;
-
-	/// 4 columns of 2 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 2, double, mediump>	mediump_dmat4x2;
-
-	/// 4 columns of 2 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 2, double, highp>		highp_dmat4x2;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 4 columns of 3 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 3, double, lowp>		lowp_dmat4x3;
-
-	/// 4 columns of 3 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 3, double, mediump>	mediump_dmat4x3;
-
-	/// 4 columns of 3 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 3, double, highp>		highp_dmat4x3;
-
-	/// @}
-
-	/// @addtogroup core_precision
-	/// @{
-
-	/// 4 columns of 4 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, double, lowp>		lowp_dmat4;
-
-	/// 4 columns of 4 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, double, mediump>	mediump_dmat4;
-
-	/// 4 columns of 4 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, double, highp>		highp_dmat4;
-
-	/// 4 columns of 4 components matrix of low qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, double, lowp>		lowp_dmat4x4;
-
-	/// 4 columns of 4 components matrix of medium qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, double, mediump>	mediump_dmat4x4;
-
-	/// 4 columns of 4 components matrix of high qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier</a>
-	typedef mat<4, 4, double, highp>		highp_dmat4x4;
-
-	/// @}
-
-#if(defined(GLM_PRECISION_LOWP_DOUBLE))
-	typedef lowp_dmat2x2		dmat2x2;
-	typedef lowp_dmat2x3		dmat2x3;
-	typedef lowp_dmat2x4		dmat2x4;
-	typedef lowp_dmat3x2		dmat3x2;
-	typedef lowp_dmat3x3		dmat3x3;
-	typedef lowp_dmat3x4		dmat3x4;
-	typedef lowp_dmat4x2		dmat4x2;
-	typedef lowp_dmat4x3		dmat4x3;
-	typedef lowp_dmat4x4		dmat4x4;
-#elif(defined(GLM_PRECISION_MEDIUMP_DOUBLE))
-	typedef mediump_dmat2x2		dmat2x2;
-	typedef mediump_dmat2x3		dmat2x3;
-	typedef mediump_dmat2x4		dmat2x4;
-	typedef mediump_dmat3x2		dmat3x2;
-	typedef mediump_dmat3x3		dmat3x3;
-	typedef mediump_dmat3x4		dmat3x4;
-	typedef mediump_dmat4x2		dmat4x2;
-	typedef mediump_dmat4x3		dmat4x3;
-	typedef mediump_dmat4x4		dmat4x4;
-#else //defined(GLM_PRECISION_HIGHP_DOUBLE)
-
-	//! 2 * 2 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat2x2		dmat2;
-
-	//! 3 * 3 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat3x3		dmat3;
-
-	//! 4 * 4 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat4x4		dmat4;
-
-	//! 2 * 2 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat2x2		dmat2x2;
-
-	//! 2 * 3 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat2x3		dmat2x3;
-
-	//! 2 * 4 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat2x4		dmat2x4;
-
-	//! 3 * 2 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat3x2		dmat3x2;
-
-	/// 3 * 3 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat3x3		dmat3x3;
-
-	/// 3 * 4 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat3x4		dmat3x4;
-
-	/// 4 * 2 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat4x2		dmat4x2;
-
-	/// 4 * 3 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat4x3		dmat4x3;
-
-	/// 4 * 4 matrix of double-qualifier floating-point numbers.
-	///
-	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 4.1.6 Matrices</a>
-	typedef highp_dmat4x4		dmat4x4;
-
-#endif//GLM_PRECISION
-
-	/// @}
-}//namespace glm

glm/detail/type_mat.inl

@@ -1,3 +0,0 @@
-/// @ref core
-/// @file glm/detail/type_mat.inl
-

glm/detail/type_mat2x2.hpp

@@ -4,7 +4,6 @@
 #pragma once
 
 #include "type_vec2.hpp"
-#include "type_mat.hpp"
 #include <limits>
 #include <cstddef>
 

glm/detail/type_mat2x2.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat2x2.inl
 
 #include "../matrix.hpp"
 

glm/detail/type_mat2x3.hpp

@@ -5,7 +5,6 @@
 
 #include "type_vec2.hpp"
 #include "type_vec3.hpp"
-#include "type_mat.hpp"
 #include <limits>
 #include <cstddef>
 

glm/detail/type_mat2x3.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat2x3.inl
 
 namespace glm
 {

glm/detail/type_mat2x4.hpp

@@ -5,7 +5,6 @@
 
 #include "type_vec2.hpp"
 #include "type_vec4.hpp"
-#include "type_mat.hpp"
 #include <limits>
 #include <cstddef>
 

glm/detail/type_mat2x4.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat2x4.inl
 
 namespace glm
 {

glm/detail/type_mat3x2.hpp

@@ -5,7 +5,6 @@
 
 #include "type_vec2.hpp"
 #include "type_vec3.hpp"
-#include "type_mat.hpp"
 #include <limits>
 #include <cstddef>
 

glm/detail/type_mat3x2.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat3x2.inl
 
 namespace glm
 {

glm/detail/type_mat3x3.hpp

@@ -4,7 +4,6 @@
 #pragma once
 
 #include "type_vec3.hpp"
-#include "type_mat.hpp"
 #include <limits>
 #include <cstddef>
 

glm/detail/type_mat3x3.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat3x3.inl
 
 #include "../matrix.hpp"
 

glm/detail/type_mat3x4.hpp

@@ -5,7 +5,6 @@
 
 #include "type_vec3.hpp"
 #include "type_vec4.hpp"
-#include "type_mat.hpp"
 #include <limits>
 #include <cstddef>
 

glm/detail/type_mat3x4.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat3x4.inl
 
 namespace glm
 {

glm/detail/type_mat4x2.hpp

@@ -5,7 +5,6 @@
 
 #include "type_vec2.hpp"
 #include "type_vec4.hpp"
-#include "type_mat.hpp"
 #include <limits>
 #include <cstddef>
 

glm/detail/type_mat4x2.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat4x2.inl
 
 namespace glm
 {

glm/detail/type_mat4x3.hpp

@@ -5,7 +5,6 @@
 
 #include "type_vec3.hpp"
 #include "type_vec4.hpp"
-#include "type_mat.hpp"
 #include <limits>
 #include <cstddef>
 

glm/detail/type_mat4x3.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat4x3.inl
 
 namespace glm
 {

glm/detail/type_mat4x4.hpp

@@ -4,7 +4,6 @@
 #pragma once
 
 #include "type_vec4.hpp"
-#include "type_mat.hpp"
 #include <limits>
 #include <cstddef>
 

glm/detail/type_mat4x4.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat4x4.inl
 
 #include "../matrix.hpp"
 

glm/detail/type_mat4x4_simd.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/detail/type_mat4x4_sse2.inl
 
 namespace glm
 {

glm/ext/vec1.hpp

@@ -2,16 +2,16 @@
 /// @file glm/vec1.hpp
 
 #pragma once
-#include "bvec1.hpp"
-#include "bvec1_precision.hpp"
-#include "fvec1.hpp"
-#include "fvec1_precision.hpp"
-#include "dvec1.hpp"
-#include "dvec1_precision.hpp"
-#include "ivec1.hpp"
-#include "ivec1_precision.hpp"
-#include "uvec1.hpp"
-#include "uvec1_precision.hpp"
+#include "vector_bvec1.hpp"
+#include "vector_bvec1_precision.hpp"
+#include "vector_vec1.hpp"
+#include "vector_vec1_precision.hpp"
+#include "vector_dvec1.hpp"
+#include "vector_dvec1_precision.hpp"
+#include "vector_ivec1.hpp"
+#include "vector_ivec1_precision.hpp"
+#include "vector_uvec1.hpp"
+#include "vector_uvec1_precision.hpp"
 
 namespace glm
 {

glm/fwd.hpp

@@ -1,13 +1,12 @@
 /// @ref core
 /// @file glm/fwd.hpp
 
-#include "detail/setup.hpp"
-
 #pragma once
+#include "glm.hpp"
 
+/*
 #include "detail/type_int.hpp"
 #include "detail/type_float.hpp"
-#include "detail/type_mat.hpp"
 
 //////////////////////
 // GLM_GTC_quaternion
@@ -2569,3 +2568,5 @@ namespace glm
 #endif
 
 }//namespace glm
+
+*/

glm/gtc/bitfield.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_bitfield
-/// @file glm/gtc/bitfield.inl
 
 #include "../simd/integer.h"
 

glm/gtc/color_space.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_color_space
-/// @file glm/gtc/color_space.inl
 
 namespace glm{
 namespace detail

glm/gtc/constants.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_constants
-/// @file glm/gtc/constants.inl
 
 #include <limits>
 

glm/gtc/epsilon.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_epsilon
-/// @file glm/gtc/epsilon.inl
 
 // Dependency:
 #include "quaternion.hpp"

glm/gtc/integer.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_integer
-/// @file glm/gtc/integer.inl
 
 namespace glm{
 namespace detail

glm/gtc/matrix_access.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_matrix_access
-/// @file glm/gtc/matrix_access.inl
 
 namespace glm
 {

glm/gtc/matrix_inverse.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_matrix_inverse
-/// @file glm/gtc/matrix_inverse.inl
 
 namespace glm
 {

glm/gtc/matrix_transform.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_matrix_transform
-/// @file glm/gtc/matrix_transform.inl
 
 #include "../geometric.hpp"
 #include "../trigonometric.hpp"

glm/gtc/noise.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_noise
-/// @file glm/gtc/noise.inl
 ///
 // Based on the work of Stefan Gustavson and Ashima Arts on "webgl-noise":
 // https://github.com/ashima/webgl-noise

glm/gtc/packing.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_packing
-/// @file glm/gtc/packing.inl
 
 #include "../ext/vector_relational.hpp"
 #include "../common.hpp"

glm/gtc/quaternion.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_quaternion
-/// @file glm/gtc/quaternion.inl
 
 #include "../trigonometric.hpp"
 #include "../geometric.hpp"

glm/gtc/quaternion_simd.inl

@@ -1,5 +1,4 @@
 /// @ref core
-/// @file glm/gtc/quaternion_simd.inl
 
 #if GLM_ARCH & GLM_ARCH_SSE2_BIT
 

glm/gtc/random.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_random
-/// @file glm/gtc/random.inl
 
 #include "../geometric.hpp"
 #include "../exponential.hpp"

glm/gtc/reciprocal.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_reciprocal
-/// @file glm/gtc/reciprocal.inl
 
 #include "../trigonometric.hpp"
 #include <limits>

glm/gtc/round.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_round
-/// @file glm/gtc/round.inl
 
 #include "../integer.hpp"
 

glm/gtc/type_precision.inl

@@ -1,5 +1,4 @@
-/// @ref gtc_swizzle
-/// @file glm/gtc/swizzle.inl
+/// @ref gtc_precision
 
 namespace glm
 {

glm/gtc/type_ptr.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_type_ptr
-/// @file glm/gtc/type_ptr.inl
 
 #include <cstring>
 

glm/gtc/ulp.inl

@@ -1,5 +1,4 @@
 /// @ref gtc_ulp
-/// @file glm/gtc/ulp.inl
 ///
 /// Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
 ///

glm/gtx/associated_min_max.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_associated_min_max
-/// @file glm/gtx/associated_min_max.inl
 
 namespace glm{
 

glm/gtx/bit.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_bit
-/// @file glm/gtx/bit.inl
 
 namespace glm
 {

glm/gtx/closest_point.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_closest_point
-/// @file glm/gtx/closest_point.inl
 
 namespace glm
 {

glm/gtx/color_encoding.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_color_encoding
-/// @file glm/gtx/color_encoding.inl
 
 namespace glm
 {

glm/gtx/color_space.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_color_space
-/// @file glm/gtx/color_space.inl
 
 namespace glm
 {

glm/gtx/color_space_YCoCg.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_color_space_YCoCg
-/// @file glm/gtx/color_space_YCoCg.inl
 
 namespace glm
 {

glm/gtx/common.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_common
-/// @file glm/gtx/common.inl
 
 #include <cmath>
 #include "../gtc/epsilon.hpp"

glm/gtx/compatibility.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_compatibility
-/// @file glm/gtx/compatibility.inl
 
 #include <limits>
 

glm/gtx/component_wise.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_component_wise
-/// @file glm/gtx/component_wise.inl
 
 #include <limits>
 

glm/gtx/dual_quaternion.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_dual_quaternion
-/// @file glm/gtx/dual_quaternion.inl
 
 #include "../geometric.hpp"
 #include <limits>

glm/gtx/easing.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_easing
-/// @file glm/gtx/easing.inl
 
 #include <cmath>
 

glm/gtx/euler_angles.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_euler_angles
-/// @file glm/gtx/euler_angles.inl
 
 #include "compatibility.hpp" // glm::atan2
 

glm/gtx/extend.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_extend
-/// @file glm/gtx/extend.inl
 
 namespace glm
 {

glm/gtx/extended_min_max.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_extended_min_max
-/// @file glm/gtx/extended_min_max.inl
 
 namespace glm
 {

glm/gtx/exterior_product.inl

@@ -1,5 +1,4 @@
-/// @ref core
-/// @file glm/detail/func_geometric.inl
+/// @ref gtx_exterior_product
 
 #include <limits>
 

glm/gtx/fast_exponential.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_fast_exponential
-/// @file glm/gtx/fast_exponential.inl
 
 namespace glm
 {

glm/gtx/fast_square_root.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_fast_square_root
-/// @file glm/gtx/fast_square_root.inl
 
 namespace glm
 {

glm/gtx/fast_trigonometry.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_fast_trigonometry
-/// @file glm/gtx/fast_trigonometry.inl
 
 namespace glm{
 namespace detail

glm/gtx/float_notmalize.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_float_normalize
-/// @file glm/gtx/float_normalize.inl
 
 #include <limits>
 

glm/gtx/functions.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_functions
-/// @file glm/gtx/functions.inl
 
 #include "../exponential.hpp"
 

glm/gtx/gradient_paint.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_gradient_paint
-/// @file glm/gtx/gradient_paint.inl
 
 namespace glm
 {

glm/gtx/handed_coordinate_space.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_handed_coordinate_space
-/// @file glm/gtx/handed_coordinate_space.inl
 
 namespace glm
 {

glm/gtx/hash.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_hash
-/// @file glm/gtx/hash.inl
 ///
 /// @see core (dependence)
 ///

glm/gtx/integer.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_integer
-/// @file glm/gtx/integer.inl
 
 namespace glm
 {

glm/gtx/intersect.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_intersect
-/// @file glm/gtx/intersect.inl
 
 namespace glm
 {

glm/gtx/io.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_io
-/// @file glm/gtx/io.inl
 /// @author Jan P Springer ([email protected])
 
 #include <iomanip>                  // std::fixed, std::setfill<>, std::setprecision, std::right, std::setw

glm/gtx/log_base.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_log_base
-/// @file glm/gtx/log_base.inl
 
 namespace glm
 {

glm/gtx/matrix_cross_product.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_matrix_cross_product
-/// @file glm/gtx/matrix_cross_product.inl
 
 namespace glm
 {

glm/gtx/matrix_decompose.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_matrix_decompose
-/// @file glm/gtx/matrix_decompose.inl
 
 #include "../gtc/constants.hpp"
 #include "../gtc/epsilon.hpp"

glm/gtx/matrix_factorisation.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_matrix_factorisation
-/// @file glm/gtx/matrix_factorisation.inl
 
 namespace glm
 {

glm/gtx/matrix_interpolation.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_matrix_interpolation
-/// @file glm/gtx/matrix_interpolation.hpp
 
 #include "../gtc/constants.hpp"
 

glm/gtx/matrix_major_storage.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_matrix_major_storage
-/// @file glm/gtx/matrix_major_storage.hpp
 
 namespace glm
 {

glm/gtx/matrix_operation.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_matrix_operation
-/// @file glm/gtx/matrix_operation.inl
 
 namespace glm
 {

glm/gtx/matrix_query.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_matrix_query
-/// @file glm/gtx/matrix_query.inl
 
 namespace glm
 {

glm/gtx/matrix_transform_2d.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_matrix_transform_2d
-/// @file glm/gtc/matrix_transform_2d.inl
 /// @author Miguel Ángel Pérez Martínez
 
 #include "../trigonometric.hpp"

glm/gtx/mixed_product.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_mixed_product
-/// @file glm/gtx/mixed_product.inl
 
 namespace glm
 {

glm/gtx/norm.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_norm
-/// @file glm/gtx/norm.inl
 
 #include "../detail/qualifier.hpp"
 

glm/gtx/normal.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_normal
-/// @file glm/gtx/normal.inl
 
 namespace glm
 {

glm/gtx/normalize_dot.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_normalize_dot
-/// @file glm/gtx/normalize_dot.inl
 
 namespace glm
 {

glm/gtx/number_precision.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_number_precision
-/// @file glm/gtx/number_precision.inl
 
 namespace glm
 {

glm/gtx/optimum_pow.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_optimum_pow
-/// @file glm/gtx/optimum_pow.inl
 
 namespace glm
 {

glm/gtx/orthonormalize.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_orthonormalize
-/// @file glm/gtx/orthonormalize.inl
 
 namespace glm
 {

glm/gtx/perpendicular.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_perpendicular
-/// @file glm/gtx/perpendicular.inl
 
 namespace glm
 {

glm/gtx/polar_coordinates.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_polar_coordinates
-/// @file glm/gtx/polar_coordinates.inl
 
 namespace glm
 {

glm/gtx/projection.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_projection
-/// @file glm/gtx/projection.inl
 
 namespace glm
 {

glm/gtx/quaternion.inl

@@ -1,5 +1,4 @@
 /// @ref gtx_quaternion
-/// @file glm/gtx/quaternion.inl
 
 #include <limits>
 #include "../gtc/constants.hpp"

glm/gtx/raw_data.inl

@@ -1,2 +1,2 @@
 /// @ref gtx_raw_data
-/// @file glm/gtx/raw_data.inl
+