mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-29 19:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

constexpr simd vec: mixed element type constructor: fix nullptr being passed to memcpy

Browse Source
This commit is contained in:
sharkautarch 2024-09-15 12:22:21 -04:00
parent 3e20cc6654
commit d5f8676b3a
No known key found for this signature in database
GPG Key ID: F270CA9462164405
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glm/detail/simd_constexpr/vec.hpp
View File

@ -295,7 +295,7 @@ namespace glm
return 1;
}
}
static inline auto ctor_mixed_constexpr_single = [](auto vs0) -> auto
static inline decltype(auto) ctor_mixed_constexpr_single = [](auto vs0) -> auto
{
using VTX = decltype(vs0);
if constexpr ( std::is_integral_v<VTX> || std::is_floating_point_v<VTX> ) {
@ -353,15 +353,18 @@ namespace glm
const auto params = std::tuple{vecOrScalar...};
const auto arr = ctor_mixed_constexpr_single(std::get<0>(params));
if (arr) [[likely]]
std::memcpy(aa.a.p.begin()+i, arr, sizeof(T)*lengths[0]);
constexpr auto i2 = i + lengths[0];
if constexpr (sizeof...(VecOrScalar) > 1) {
const auto arr2 = ctor_mixed_constexpr_single(std::get<1>(params));
if (arr2) [[likely]]
std::memcpy(aa.a.p.begin()+i2, arr2, sizeof(T)*lengths[1]);
constexpr auto i3 = i2 + lengths[1];
if constexpr (sizeof...(VecOrScalar) > 2) {
const auto arr3 = ctor_mixed_constexpr_single(std::get<2>(params));
if (arr3) [[likely]]
std::memcpy(aa.a.p.begin()+i3, arr3, sizeof(T)*lengths[2]);
}
}