X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=372064b28948238c1c30815f7cb9cdb82087128f;hp=9c2ce597499d42a829097ddb5e3700341fde2ca1;hb=56ff92c5828a143595eeb7a1906418cc30668f9d;hpb=9651a4eaae012cdc49c1aa38197861e04f62e91e

diff --git a/util.cpp b/util.cpp
index 9c2ce59..372064b 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,4 +1,4 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
@@ -11,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)
@@ -99,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;
@@ -175,3 +177,47 @@ 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;
+}
+
+}  // namespace movit