Browse Source

Fixed build

Christophe Riccio 9 years ago
parent
commit
5aa2dfd465
1 changed files with 21 additions and 21 deletions
  1. 21 21
      test/external/gli/format.hpp

+ 21 - 21
test/external/gli/format.hpp

@@ -285,7 +285,7 @@ namespace gli
 		return Format >= FORMAT_FIRST && Format <= FORMAT_LAST;
 	}
 
-	typedef glm::tvec4<swizzle> swizzles;
+	typedef glm::vec<4, swizzle> swizzles;
 
 	/// Evaluate whether a format is compressed
 	bool is_compressed(format Format);
@@ -305,35 +305,35 @@ namespace gli
 	/// Return the number of components of a format
 	size_t component_count(format Format);
 
-    /// Evaluate whether a format is unsigned
-    bool is_unsigned(format Format);
+	/// Evaluate whether a format is unsigned
+	bool is_unsigned(format Format);
 
-    /// Evaluate whether a format is signed
-    bool is_signed(format Format);
+	/// Evaluate whether a format is signed
+	bool is_signed(format Format);
 
-    /// Evaluate whether the format is an integer format
-    bool is_integer(format Format);
+	/// Evaluate whether the format is an integer format
+	bool is_integer(format Format);
 
-    /// Evaluate whether the format is a signed integer format
-    bool is_signed_integer(format Format);
+	/// Evaluate whether the format is a signed integer format
+	bool is_signed_integer(format Format);
 
-    /// Evaluate whether the format is an unsigned integer format
-    bool is_unsigned_integer(format Format);
+	/// Evaluate whether the format is an unsigned integer format
+	bool is_unsigned_integer(format Format);
 
-    /// Evaluate whether the format is an float format
-    bool is_float(format Format);
+	/// Evaluate whether the format is an float format
+	bool is_float(format Format);
 
-    /// Evaluate whether the format is normalized
-    bool is_normalized(format Format);
+	/// Evaluate whether the format is normalized
+	bool is_normalized(format Format);
 
-    /// Evaluate whether the format is an unsigned normalized format
-    bool is_unorm(format Format);
+	/// Evaluate whether the format is an unsigned normalized format
+	bool is_unorm(format Format);
 
-    /// Evaluate whether the format is a signed normalized format
-    bool is_snorm(format Format);
+	/// Evaluate whether the format is a signed normalized format
+	bool is_snorm(format Format);
 
-    /// Evaluate whether the format is packed
-    bool is_packed(format Format);
+	/// Evaluate whether the format is packed
+	bool is_packed(format Format);
 
 }//namespace gli