Fixed build
This commit is contained in:
parent
d2730008dd
commit
b51fe09cb9
@ -100,7 +100,7 @@ namespace glm
|
|||||||
|
|
||||||
namespace detail
|
namespace detail
|
||||||
{
|
{
|
||||||
template <bool T>
|
template <bool isFloat>
|
||||||
struct compute_log2
|
struct compute_log2
|
||||||
{
|
{
|
||||||
template <typename T>
|
template <typename T>
|
||||||
|
@ -26,6 +26,8 @@
|
|||||||
/// @author Christophe Riccio
|
/// @author Christophe Riccio
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#include <limits>
|
||||||
|
|
||||||
namespace glm
|
namespace glm
|
||||||
{
|
{
|
||||||
template <typename T, precision P, template <typename, precision> class vecType>
|
template <typename T, precision P, template <typename, precision> class vecType>
|
||||||
|
@ -23,8 +23,8 @@ namespace glm
|
|||||||
template <typename genIType>
|
template <typename genIType>
|
||||||
GLM_FUNC_QUALIFIER genIType extractField
|
GLM_FUNC_QUALIFIER genIType extractField
|
||||||
(
|
(
|
||||||
float const & value,
|
float const & value,
|
||||||
genIType const & first,
|
genIType const & first,
|
||||||
genIType const & count
|
genIType const & count
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
@ -32,18 +32,6 @@ namespace glm
|
|||||||
return (detail::uif32(value).i << first) >> ((sizeof(float) << 3) - count);
|
return (detail::uif32(value).i << first) >> ((sizeof(float) << 3) - count);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename genIType>
|
|
||||||
GLM_FUNC_QUALIFIER genIType extractField
|
|
||||||
(
|
|
||||||
double const & value,
|
|
||||||
genIType const & first,
|
|
||||||
genIType const & count
|
|
||||||
)
|
|
||||||
{
|
|
||||||
assert(first + count < sizeof(double));
|
|
||||||
return (detail::uif64(value).i << first) >> ((sizeof(double) << genIType(3)) - count);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename genIUType, typename sizeType>
|
template <typename genIUType, typename sizeType>
|
||||||
GLM_FUNC_QUALIFIER genIUType extractField
|
GLM_FUNC_QUALIFIER genIUType extractField
|
||||||
(
|
(
|
||||||
|
@ -142,7 +142,7 @@ int test_ctr()
|
|||||||
{8, 9, 10, 11},
|
{8, 9, 10, 11},
|
||||||
{12, 13, 14, 15}};
|
{12, 13, 14, 15}};
|
||||||
|
|
||||||
glm::mat4 m4{m3};
|
//glm::mat4 m4{m3};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
std::vector<glm::mat4> v{
|
std::vector<glm::mat4> v{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user