You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
glm/glm-no-gcc-integer-log2.patch

16 lines
652 B

diff -ru glm-0.9.3.2-orig/glm/gtx/integer.inl glm-0.9.3.2/glm/gtx/integer.inl
--- glm-0.9.3.2-orig/glm/gtx/integer.inl 2012-09-02 21:53:24.298350117 +0300
+++ glm-0.9.3.2/glm/gtx/integer.inl 2012-09-02 21:54:42.435203223 +0300
@@ -60,10 +60,8 @@
template <typename T>
GLM_FUNC_QUALIFIER T operator() (T const & Value) const
{
-#if(GLM_COMPILER & GLM_COMPILER_VC)
+#if(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_GCC))
return Value <= T(1) ? T(0) : T(32) - nlz(Value - T(1));
-#elif(GLM_COMPILER & GLM_COMPILER_GCC)
- return Value <= T(1) ? T(0) : nlz(Value - T(1)) + 1;
#else
return T(32) - nlz(Value - T(1));
#endif