mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.3' into 0.9.4

Browse Source
This commit is contained in:
Christophe Riccio
2012-01-11 20:38:04 +00:00
parent 9a394874c3 0a7368d6ec
commit b19f609f51
2 changed files with 3 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtx/integer.inl
View File

@@ -58,7 +58,7 @@ namespace _detail
struct _compute_log2<detail::float_or_int_value::GLM_INT>
{
template <typename T>
T operator() (T const & Value) const
GLM_FUNC_QUALIFIER T operator() (T const & Value) const
{
#if(GLM_COMPILER & GLM_COMPILER_VC)
return Value <= T(1) ? T(0) : T(32) - nlz(Value - T(1));
@@ -73,7 +73,7 @@ namespace _detail
}//namespace _detail
// Henry Gordon Dietz: http://aggregate.org/MAGIC/
unsigned int floor_log2(unsigned int x)
GLM_FUNC_QUALIFIER unsigned int floor_log2(unsigned int x)
{
x |= (x >> 1);
x |= (x >> 2);