X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=01787f013e0a4c70817be2ccf49743cddb7bd254;hp=a1fac6da35473ed1a77d64b8ed39bc53a9024a09;hb=5ee3e6bb0bf100d57a06911b89c3a0a0dc49e2be;hpb=ad66f9714e4a36008c341355700272a52484a785

diff --git a/util.cpp b/util.cpp
index a1fac6d..01787f0 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,14 +1,27 @@
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <Eigen/Core>
 
 #include "init.h"
 #include "util.h"
 
-extern std::string *movit_data_directory;
+#if defined(__DARWIN__)
+#include <OpenGL/OpenGL.h>
+#elif defined(WIN32)
+#include <epoxy/wgl.h>
+#else
+#include <epoxy/glx.h>
+#endif
+
+using namespace std;
+
+namespace movit {
+
+extern string *movit_data_directory;
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {
@@ -66,9 +79,9 @@ void hsv2rgb_normalized(float h, float s, float v, float *r, float *g, float *b)
 	}
 }
 
-std::string read_file(const std::string &filename)
+string read_file(const string &filename)
 {
-	const std::string full_pathname = *movit_data_directory + "/" + filename;
+	const string full_pathname = *movit_data_directory + "/" + filename;
 
 	static char buf[131072];
 	FILE *fp = fopen(full_pathname.c_str(), "r");
@@ -80,10 +93,23 @@ std::string read_file(const std::string &filename)
 	int len = fread(buf, 1, sizeof(buf), fp);
 	fclose(fp);
 
-	return std::string(buf, len);
+	return string(buf, len);
+}
+
+string read_version_dependent_file(const string &base, const string &extension)
+{
+	if (movit_shader_model == MOVIT_GLSL_110) {
+		return read_file(base + "." + extension);
+	} else if (movit_shader_model == MOVIT_GLSL_130) {
+		return read_file(base + ".130." + extension);
+	} else if (movit_shader_model == MOVIT_ESSL_300) {
+		return read_file(base + ".300es." + extension);
+	} else {
+		assert(false);
+	}
 }
 
-GLuint compile_shader(const std::string &shader_src, GLenum type)
+GLuint compile_shader(const string &shader_src, GLenum type)
 {
 	GLuint obj = glCreateShader(type);
 	const GLchar* source[] = { shader_src.data() };
@@ -96,7 +122,7 @@ GLuint compile_shader(const std::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;
@@ -116,7 +142,7 @@ void print_3x3_matrix(const Eigen::Matrix3d& m)
 	printf("\n");
 }
 
-std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m)
+string output_glsl_mat3(const string &name, const Eigen::Matrix3d &m)
 {
 	char buf[1024];
 	sprintf(buf,
@@ -172,3 +198,71 @@ 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;
+}
+
+void *get_gl_context_identifier()
+{
+#if defined(__DARWIN__)
+	return (void *)CGLGetCurrentContext();
+#elif defined(WIN32)
+	return (void *)wglGetCurrentContext();
+#else
+	return (void *)glXGetCurrentContext();
+#endif
+}
+
+}  // namespace movit