Merge branch 'master' into epoxy

[movit] / util.cpp

diff --git a/util.cpp b/util.cpp
index 8162f712d02eed8f5b47b7f481b977b827f56f8f..ac6a218098873953d25036605d728ed98257ec70 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -1,4 +1,4 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
@@ -220,4 +220,17 @@ unsigned div_round_up(unsigned a, unsigned b)
        return (a + b - 1) / b;
 }
 
+// Algorithm from http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2.
+unsigned next_power_of_two(unsigned v)
+{
+       v--;
+       v |= v >> 1;
+       v |= v >> 2;
+       v |= v >> 4;
+       v |= v >> 8;
+       v |= v >> 16;
+       v++;
+       return v;
+}
+
 }  // namespace movit