mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #976 from amaury-ml/compfix

Browse Source 
Fixing minor issues reported by the compiler #976
This commit is contained in:
Christophe 2019-11-29 11:24:25 +01:00 committed by GitHub
commit d666b5e533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glm/detail/func_common.inl
View File

@ -287,7 +287,8 @@ namespace detail
std::numeric_limits<genFIType>::is_iec559 || (std::numeric_limits<genFIType>::is_signed && std::numeric_limits<genFIType>::is_integer), std::numeric_limits<genFIType>::is_iec559 || (std::numeric_limits<genFIType>::is_signed && std::numeric_limits<genFIType>::is_integer),
"'sign' only accept signed inputs"); "'sign' only accept signed inputs");
return detail::compute_sign<1, genFIType, defaultp, std::numeric_limits<genFIType>::is_iec559, highp>::call(vec<1, genFIType>(x)).x; return detail::compute_sign<1, genFIType, defaultp,
std::numeric_limits<genFIType>::is_iec559, detail::is_aligned<highp>::value>::call(vec<1, genFIType>(x)).x;
} }
template<length_t L, typename T, qualifier Q> template<length_t L, typename T, qualifier Q>

2
glm/detail/func_geometric_simd.inl
View File

@ -155,7 +155,7 @@ namespace detail
float32x4_t vd = vrsqrteq_f32(p); float32x4_t vd = vrsqrteq_f32(p);
vec<4, float, Q> Result; vec<4, float, Q> Result;
Result.data = vmulq_f32(v, vd); Result.data = vmulq_f32(v.data, vd);
return Result; return Result;
} }
}; };

22
glm/detail/type_vec4_simd.inl
View File

@ -582,28 +582,6 @@ namespace detail {
} }
}; };
template<qualifier Q>
struct compute_vec4_div<uint, Q, true>
{
static vec<4, uint, Q> call(vec<4, uint, Q> const& a, vec<4, uint, Q> const& b)
{
vec<4, uint, Q> Result;
Result.data = vdivq_u32(a.data, b.data);
return Result;
}
};
template<qualifier Q>
struct compute_vec4_div<int, Q, true>
{
static vec<4, int, Q> call(vec<4, float, Q> const& a, vec<4, int, Q> const& b)
{
vec<4, int, Q> Result;
Result.data = vdivq_s32(a.data, b.data);
return Result;
}
};
template<qualifier Q> template<qualifier Q>
struct compute_vec4_equal<float, Q, false, 32, true> struct compute_vec4_equal<float, Q, false, 32, true>
{ {