mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-09-20 08:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Christophe Riccio 2014-11-22 23:26:18 +01:00
parent 011a056267
commit 246609b453
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -78,7 +78,6 @@ elseif(GLM_TEST_ENABLE_SIMD_AVX2)
elseif(GLM_USE_INTEL) elseif(GLM_USE_INTEL)
add_definitions(/QxAVX2) add_definitions(/QxAVX2)
elseif(MSVC) elseif(MSVC)
message("AVX2")
add_definitions(/arch:AVX2) add_definitions(/arch:AVX2)
endif() endif()
elseif(GLM_TEST_ENABLE_SIMD_AVX) elseif(GLM_TEST_ENABLE_SIMD_AVX)

8
glm/detail/func_integer.inl
View File

@ -133,7 +133,7 @@ namespace detail
} }
}; };
template <typename T, glm::precision P, template <class, glm::precision> class vecType> template <typename T, glm::precision P, template <typename, glm::precision> class vecType>
struct compute_findMSB_step_vec<T, P, vecType, false> struct compute_findMSB_step_vec<T, P, vecType, false>
{ {
GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, T) GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & x, T)
@ -142,7 +142,7 @@ namespace detail
} }
}; };
template <typename T, glm::precision P, template <class, glm::precision> class vecType, std::size_t> template <typename T, glm::precision P, template <typename, glm::precision> class vecType, int>
struct compute_findMSB_vec struct compute_findMSB_vec
{ {
GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & vec) GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & vec)
@ -178,7 +178,7 @@ namespace detail
template <typename T, glm::precision P, template <class, glm::precision> class vecType> template <typename T, glm::precision P, template <class, glm::precision> class vecType>
struct compute_findMSB_vec<T, P, vecType, 32> struct compute_findMSB_vec<T, P, vecType, 32>
{ {
GLM_FUNC_QUALIFIER static int call(vecType<T, P> const & x) GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & x)
{ {
return detail::functor1<int, T, P, vecType>::call(compute_findMSB_32, x); return detail::functor1<int, T, P, vecType>::call(compute_findMSB_32, x);
} }
@ -187,7 +187,7 @@ namespace detail
template <typename T, glm::precision P, template <class, glm::precision> class vecType> template <typename T, glm::precision P, template <class, glm::precision> class vecType>
struct compute_findMSB_vec<T, P, vecType, 64> struct compute_findMSB_vec<T, P, vecType, 64>
{ {
GLM_FUNC_QUALIFIER static int call(vecType<T, P> const & x) GLM_FUNC_QUALIFIER static vecType<int, P> call(vecType<T, P> const & x)
{ {
return detail::functor1<int, T, P, vecType>::call(compute_findMSB_64, x); return detail::functor1<int, T, P, vecType>::call(compute_findMSB_64, x);
} }