X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=util.h;h=627c62934d7ce857ef4bb2263e35c6d1e30d4ec9;hb=d398770154ecc4bc95282dc45656789dd5686309;hp=e12c2c422e114f72c5e2739af2a94a8fec575688;hpb=ac4fc36aa70ffefb6b9632dc0abea5cbbce5387b;p=movit

diff --git a/util.h b/util.h
index e12c2c4..627c629 100644
--- a/util.h
+++ b/util.h
@@ -11,6 +11,8 @@
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
+namespace movit {
+
 // Converts a HSV color to RGB. Assumes h in [0, 2pi> or [-pi, pi>
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b);
 
@@ -41,16 +43,19 @@ std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m);
 // (estimated) squared errors of the two weights.
 void combine_two_samples(float w1, float w2, float *offset, float *total_weight, float *sum_sq_error);
 
+// Create a VBO with the given data, and bind it to the vertex attribute
+// with name <attribute_name>. Returns the VBO number.
+GLuint fill_vertex_attribute(GLuint glsl_program_num, const std::string &attribute_name, GLint size, GLenum type, GLsizeiptr data_size, const GLvoid *data);
+
+// Clean up after fill_vertex_attribute().
+void cleanup_vertex_attribute(GLuint glsl_program_num, const std::string &attribute_name, GLuint vbo);
+
+}  // namespace movit
+
 #ifdef NDEBUG
 #define check_error()
 #else
-#define check_error() { int err = glGetError(); if (err != GL_NO_ERROR) { printf("GL error 0x%x at %s:%d\n", err, __FILE__, __LINE__); exit(1); } }
-#endif
-
-#ifdef __GNUC__
-#define MUST_CHECK_RESULT __attribute__((warn_unused_result))
-#else
-#define MUST_CHECK_RESULT 
+#define check_error() { int err = glGetError(); if (err != GL_NO_ERROR) { printf("GL error 0x%x at %s:%d\n", err, __FILE__, __LINE__); abort(); } }
 #endif
 
 // CHECK() is like assert(), but retains any side effects no matter the compilation mode.