Merge branch 'master' into epoxy

[movit] / util.h

diff --git a/util.h b/util.h
index c59231d205d2537c4ec965a4b5b85cf4162ff8f4..a3e262fa59709469034f33c0c6aa4be1c5cb605b 100644 (file)
--- a/util.h
+++ b/util.h
@@ -3,7 +3,7 @@
 
 // Various utilities.
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <Eigen/Core>
@@ -53,6 +53,9 @@ GLuint fill_vertex_attribute(GLuint glsl_program_num, const std::string &attribu
 // Clean up after fill_vertex_attribute().
 void cleanup_vertex_attribute(GLuint glsl_program_num, const std::string &attribute_name, GLuint vbo);
 
+// If v is not already a power of two, return the first higher power of two.
+unsigned next_power_of_two(unsigned v);
+
 }  // namespace movit
 
 #ifdef NDEBUG