X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=310e7be7f6627bf58fc5f5556712eafab4a3fa3f;hp=6b1de53cc35b52af8094a65a97e442aba43f81f8;hb=ab9c8178e08a02283be206ea56dc91206512ca87;hpb=85f9719bf3519b1f1942738d11601584f5d38725

diff --git a/util.cpp b/util.cpp
index 6b1de53..310e7be 100644
--- a/util.cpp
+++ b/util.cpp
@@ -2,6 +2,7 @@
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <Eigen/Core>
 
@@ -10,6 +11,8 @@
 
 using namespace std;
 
+namespace movit {
+
 extern string *movit_data_directory;
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
@@ -98,7 +101,7 @@ GLuint compile_shader(const string &shader_src, GLenum type)
 	glGetShaderInfoLog(obj, log_length, &log_length, info_log);
 	info_log[log_length] = 0; 
 	if (strlen(info_log) > 0) {
-		printf("shader compile log: %s\n", info_log);
+		fprintf(stderr, "Shader compile log: %s\n", info_log);
 	}
 
 	GLint status;
@@ -174,3 +177,60 @@ void combine_two_samples(float w1, float w2, float *offset, float *total_weight,
 	assert(*offset >= 0.0f);
 	assert(*offset <= 1.0f);
 }
+
+GLuint fill_vertex_attribute(GLuint glsl_program_num, const string &attribute_name, GLint size, GLenum type, GLsizeiptr data_size, const GLvoid *data)
+{
+	int attrib = glGetAttribLocation(glsl_program_num, attribute_name.c_str());
+	if (attrib == -1) {
+		return -1;
+	}
+
+	GLuint vbo;
+	glGenBuffers(1, &vbo);
+	check_error();
+	glBindBuffer(GL_ARRAY_BUFFER, vbo);
+	check_error();
+	glBufferData(GL_ARRAY_BUFFER, data_size, data, GL_STATIC_DRAW);
+	check_error();
+	glEnableVertexAttribArray(attrib);
+	check_error();
+	glVertexAttribPointer(attrib, size, type, GL_FALSE, 0, BUFFER_OFFSET(0));
+	check_error();
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+	check_error();
+
+	return vbo;
+}
+
+void cleanup_vertex_attribute(GLuint glsl_program_num, const string &attribute_name, GLuint vbo)
+{
+	int attrib = glGetAttribLocation(glsl_program_num, attribute_name.c_str());
+	if (attrib == -1) {
+		return;
+	}
+
+	glDisableVertexAttribArray(attrib);
+	check_error();
+	glDeleteBuffers(1, &vbo);
+	check_error();
+}
+
+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