From 5aa2dfd465d92f525fee4f9feda62ada0a3fe0ba Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 31 Dec 2016 11:46:23 +0100 Subject: [PATCH] Fixed build --- test/external/gli/format.hpp | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/test/external/gli/format.hpp b/test/external/gli/format.hpp index ef044492..4035fa98 100644 --- a/test/external/gli/format.hpp +++ b/test/external/gli/format.hpp @@ -285,7 +285,7 @@ namespace gli return Format >= FORMAT_FIRST && Format <= FORMAT_LAST; } - typedef glm::tvec4 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