From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- external/include/glm/detail/func_common_simd.inl | 158 +++++++++++------------ 1 file changed, 79 insertions(+), 79 deletions(-) (limited to 'external/include/glm/detail/func_common_simd.inl') diff --git a/external/include/glm/detail/func_common_simd.inl b/external/include/glm/detail/func_common_simd.inl index c76f180..a3482ff 100644 --- a/external/include/glm/detail/func_common_simd.inl +++ b/external/include/glm/detail/func_common_simd.inl @@ -10,191 +10,191 @@ namespace glm{ namespace detail { - template - struct compute_abs_vector + template + struct compute_abs_vector<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& v) { - tvec4 result(uninitialize); + vec<4, float, Q> result; result.data = glm_vec4_abs(v.data); return result; } }; - template - struct compute_abs_vector + template + struct compute_abs_vector<4, int, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) + GLM_FUNC_QUALIFIER static vec<4, int, Q> call(vec<4, int, Q> const& v) { - tvec4 result(uninitialize); + vec<4, int, Q> result; result.data = glm_ivec4_abs(v.data); return result; } }; - template - struct compute_floor + template + struct compute_floor<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& v) { - tvec4 result(uninitialize); + vec<4, float, Q> result; result.data = glm_vec4_floor(v.data); return result; } }; - template - struct compute_ceil + template + struct compute_ceil<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& v) { - tvec4 result(uninitialize); + vec<4, float, Q> result; result.data = glm_vec4_ceil(v.data); return result; } }; - template - struct compute_fract + template + struct compute_fract<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& v) { - tvec4 result(uninitialize); + vec<4, float, Q> result; result.data = glm_vec4_fract(v.data); return result; } }; - template - struct compute_round + template + struct compute_round<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& v) { - tvec4 result(uninitialize); + vec<4, float, Q> result; result.data = glm_vec4_round(v.data); return result; } }; - template - struct compute_mod + template + struct compute_mod<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & y) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& x, vec<4, float, Q> const& y) { - tvec4 result(uninitialize); + vec<4, float, Q> result; result.data = glm_vec4_mod(x.data, y.data); return result; } }; - template - struct compute_min_vector + template + struct compute_min_vector<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& v1, vec<4, float, Q> const& v2) { - tvec4 result(uninitialize); + vec<4, float, Q> result; result.data = _mm_min_ps(v1.data, v2.data); return result; } }; - template - struct compute_min_vector + template + struct compute_min_vector<4, int32, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER static vec<4, int32, Q> call(vec<4, int32, Q> const& v1, vec<4, int32, Q> const& v2) { - tvec4 result(uninitialize); + vec<4, int32, Q> result; result.data = _mm_min_epi32(v1.data, v2.data); return result; } }; - template - struct compute_min_vector + template + struct compute_min_vector<4, uint32, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER static vec<4, int32, Q> call(vec<4, uint32, Q> const& v1, vec<4, uint32, Q> const& v2) { - tvec4 result(uninitialize); + vec<4, uint32, Q> result; result.data = _mm_min_epu32(v1.data, v2.data); return result; } }; - template - struct compute_max_vector + template + struct compute_max_vector<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& v1, vec<4, float, Q> const& v2) { - tvec4 result(uninitialize); + vec<4, float, Q> result; result.data = _mm_max_ps(v1.data, v2.data); return result; } }; - template - struct compute_max_vector + template + struct compute_max_vector<4, int32, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER static vec<4, int32, Q> call(vec<4, int32, Q> const& v1, vec<4, int32, Q> const& v2) { - tvec4 result(uninitialize); + vec<4, int32, Q> result; result.data = _mm_max_epi32(v1.data, v2.data); return result; } }; - template - struct compute_max_vector + template + struct compute_max_vector<4, uint32, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER static vec<4, uint32, Q> call(vec<4, uint32, Q> const& v1, vec<4, uint32, Q> const& v2) { - tvec4 result(uninitialize); + vec<4, uint32, Q> result; result.data = _mm_max_epu32(v1.data, v2.data); return result; } }; - template - struct compute_clamp_vector + template + struct compute_clamp_vector<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & minVal, tvec4 const & maxVal) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& x, vec<4, float, Q> const& minVal, vec<4, float, Q> const& maxVal) { - tvec4 result(uninitialize); + vec<4, float, Q> result; result.data = _mm_min_ps(_mm_max_ps(x.data, minVal.data), maxVal.data); return result; } }; - template - struct compute_clamp_vector + template + struct compute_clamp_vector<4, int32, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & minVal, tvec4 const & maxVal) + GLM_FUNC_QUALIFIER static vec<4, int32, Q> call(vec<4, int32, Q> const& x, vec<4, int32, Q> const& minVal, vec<4, int32, Q> const& maxVal) { - tvec4 result(uninitialize); + vec<4, int32, Q> result; result.data = _mm_min_epi32(_mm_max_epi32(x.data, minVal.data), maxVal.data); return result; } }; - template - struct compute_clamp_vector + template + struct compute_clamp_vector<4, uint32, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & minVal, tvec4 const & maxVal) + GLM_FUNC_QUALIFIER static vec<4, uint32, Q> call(vec<4, uint32, Q> const& x, vec<4, uint32, Q> const& minVal, vec<4, uint32, Q> const& maxVal) { - tvec4 result(uninitialize); + vec<4, uint32, Q> result; result.data = _mm_min_epu32(_mm_max_epu32(x.data, minVal.data), maxVal.data); return result; } }; - template - struct compute_mix_vector + template + struct compute_mix_vector<4, float, bool, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const & x, tvec4 const & y, tvec4 const & a) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& x, vec<4, float, Q> const& y, vec<4, bool, Q> const& a) { - __m128i const Load = _mm_set_epi32(-(int)a.w, -(int)a.z, -(int)a.y, -(int)a.x); + __m128i const Load = _mm_set_epi32(-static_cast(a.w), -static_cast(a.z), -static_cast(a.y), -static_cast(a.x)); __m128 const Mask = _mm_castsi128_ps(Load); - tvec4 Result(uninitialize); + vec<4, float, Q> Result; # if 0 && GLM_ARCH & GLM_ARCH_AVX Result.data = _mm_blendv_ps(x.data, y.data, Mask); # else @@ -204,25 +204,25 @@ namespace detail } }; /* FIXME - template - struct compute_step_vector + template + struct compute_step_vector { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const& edge, tvec4 const& x) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& edge, vec<4, float, Q> const& x) { - tvec4 result(uninitialize); + vec<4, float, Q> Result; result.data = glm_vec4_step(edge.data, x.data); return result; } }; */ - template - struct compute_smoothstep_vector + template + struct compute_smoothstep_vector<4, float, Q, true> { - GLM_FUNC_QUALIFIER static tvec4 call(tvec4 const& edge0, tvec4 const& edge1, tvec4 const& x) + GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<4, float, Q> const& edge0, vec<4, float, Q> const& edge1, vec<4, float, Q> const& x) { - tvec4 result(uninitialize); - result.data = glm_vec4_smoothstep(edge0.data, edge1.data, x.data); - return result; + vec<4, float, Q> Result; + Result.data = glm_vec4_smoothstep(edge0.data, edge1.data, x.data); + return Result; } }; }//namespace detail -- cgit v1.2.3