Merge branch 'master' into epoxy

[movit] / util.h

diff --git a/util.h b/util.h
index 77841023363b862a834c86ee9367b28038650b4e..5c15c9f789fceda67e764002413d053911524806 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].
 //