diff --git a/gli/core/convert_func.hpp b/gli/core/convert_func.hpp index 8f3e7a88..f61482ef 100644 --- a/gli/core/convert_func.hpp +++ b/gli/core/convert_func.hpp @@ -176,7 +176,7 @@ namespace detail static vec<4, retType, P> fetch(textureType const & Texture, typename textureType::extent_type const & TexelCoord, typename textureType::size_type Layer, typename textureType::size_type Face, typename textureType::size_type Level) { - return make_vec4(vec(access::load(Texture, TexelCoord, Layer, Face, Level))); + return gli::make_vec4(vec(access::load(Texture, TexelCoord, Layer, Face, Level))); } static void write(textureType & Texture, typename textureType::extent_type const & TexelCoord, typename textureType::size_type Layer, typename textureType::size_type Face, typename textureType::size_type Level, vec<4, retType, P> const & Texel) @@ -205,7 +205,7 @@ namespace detail static vec<4, retType, P> fetch(textureType const & Texture, typename textureType::extent_type const & TexelCoord, typename textureType::size_type Layer, typename textureType::size_type Face, typename textureType::size_type Level) { static_assert(std::numeric_limits::is_iec559, "CONVERT_MODE_NORM requires a float sampler"); - return make_vec4(compNormalize(access::load(Texture, TexelCoord, Layer, Face, Level))); + return gli::make_vec4(compNormalize(access::load(Texture, TexelCoord, Layer, Face, Level))); } static void write(textureType & Texture, typename textureType::extent_type const & TexelCoord, typename textureType::size_type Layer, typename textureType::size_type Face, typename textureType::size_type Level, vec<4, retType, P> const & Texel) @@ -223,7 +223,7 @@ namespace detail static vec<4, retType, P> fetch(textureType const & Texture, typename textureType::extent_type const & TexelCoord, typename textureType::size_type Layer, typename textureType::size_type Face, typename textureType::size_type Level) { static_assert(std::numeric_limits::is_iec559, "CONVERT_MODE_SRGB requires a float sampler"); - return make_vec4(convertSRGBToLinear(compNormalize(access::load(Texture, TexelCoord, Layer, Face, Level)))); + return gli::make_vec4(convertSRGBToLinear(compNormalize(access::load(Texture, TexelCoord, Layer, Face, Level)))); } static void write(textureType & Texture, typename textureType::extent_type const & TexelCoord, typename textureType::size_type Layer, typename textureType::size_type Face, typename textureType::size_type Level, vec<4, retType, P> const & Texel) @@ -277,7 +277,7 @@ namespace detail static vec<4, retType, P> fetch(textureType const & Texture, typename textureType::extent_type const & TexelCoord, typename textureType::size_type Layer, typename textureType::size_type Face, typename textureType::size_type Level) { static_assert(std::numeric_limits::is_iec559, "CONVERT_MODE_HALF requires a float sampler"); - return make_vec4(vec(unpackHalf(access::load(Texture, TexelCoord, Layer, Face, Level)))); + return gli::make_vec4(vec(unpackHalf(access::load(Texture, TexelCoord, Layer, Face, Level)))); } static void write(textureType & Texture, typename textureType::extent_type const & TexelCoord, typename textureType::size_type Layer, typename textureType::size_type Face, typename textureType::size_type Level, vec<4, retType, P> const & Texel)