Merge branch 'master' into epoxy

[movit] / util.h

diff --git a/util.h b/util.h
index 77841023363b862a834c86ee9367b28038650b4e..a3e262fa59709469034f33c0c6aa4be1c5cb605b 100644 (file)
--- a/util.h
+++ b/util.h
@@ -34,6 +34,9 @@ void print_3x3_matrix(const Eigen::Matrix3d &m);
 // Output a GLSL 3x3 matrix declaration.
 std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m);
 
+// Calculate a / b, rounding up. Does not handle overflow correctly.
+unsigned div_round_up(unsigned a, unsigned b);
+
 // Calculate where to sample, and with what weight, if one wants to use
 // the GPU's bilinear hardware to sample w1 * x[0] + w2 * x[1].
 //
@@ -50,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