X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=fb66514a290d1cb780c6a87b2fae4b97a8d9627f;hp=cab91bf51814ae435632381754486c8f72063d80;hb=refs%2Fheads%2Fepoxy;hpb=f428e5f85aeda850d43c4b134fbb286b574c63fb

diff --git a/effect.cpp b/effect.cpp
index cab91bf..fb66514 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,115 +1,151 @@
-#define GL_GLEXT_PROTOTYPES 1
-
+#include <epoxy/gl.h>
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
+#include <utility>
+
 #include "effect.h"
-#include "util.h"
+#include "effect_util.h"
+
+using namespace std;
 
-#include <GL/gl.h>
-#include <GL/glext.h>
+namespace movit {
 
-void set_uniform_float(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, float value)
+bool Effect::set_int(const string &key, int value)
 {
-	std::string name = prefix + "_" + key;
-	GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
-	if (l == -1) {
-		return;
+	if (params_int.count(key) == 0) {
+		return false;
 	}
-	check_error();
-	glUniform1f(l, value);
-	check_error();
+	*params_int[key] = value;
+	return true;
 }
 
-void set_uniform_vec3(GLhandleARB glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+bool Effect::set_float(const string &key, float value)
 {
-	std::string name = prefix + "_" + key;
-	GLint l = glGetUniformLocation(glsl_program_num, name.c_str());
-	if (l == -1) {
-		return;
+	if (params_float.count(key) == 0) {
+		return false;
 	}
-	check_error();
-	glUniform3fv(l, 1, values);
-	check_error();
+	*params_float[key] = value;
+	return true;
 }
 
-bool Effect::set_int(const std::string &key, int value)
+bool Effect::set_vec2(const string &key, const float *values)
 {
-	if (params_int.count(key) == 0) {
+	if (params_vec2.count(key) == 0) {
 		return false;
 	}
-	*params_int[key] = value;
+	memcpy(params_vec2[key], values, sizeof(float) * 2);
 	return true;
 }
 
-bool Effect::set_float(const std::string &key, float value)
+bool Effect::set_vec3(const string &key, const float *values)
 {
-	if (params_float.count(key) == 0) {
+	if (params_vec3.count(key) == 0) {
 		return false;
 	}
-	*params_float[key] = value;
+	memcpy(params_vec3[key], values, sizeof(float) * 3);
 	return true;
 }
 
-bool Effect::set_vec3(const std::string &key, const float *values)
+bool Effect::set_vec4(const string &key, const float *values)
 {
-	if (params_vec3.count(key) == 0) {
+	if (params_vec4.count(key) == 0) {
 		return false;
 	}
-	memcpy(params_vec3[key], values, sizeof(float) * 3);
+	memcpy(params_vec4[key], values, sizeof(float) * 4);
 	return true;
 }
 
-void Effect::register_int(const std::string &key, int *value)
+void Effect::register_int(const string &key, int *value)
 {
 	assert(params_int.count(key) == 0);
 	params_int[key] = value;
 }
 
-void Effect::register_float(const std::string &key, float *value)
+void Effect::register_float(const string &key, float *value)
 {
 	assert(params_float.count(key) == 0);
 	params_float[key] = value;
 }
 
-void Effect::register_vec3(const std::string &key, float *values)
+void Effect::register_vec2(const string &key, float *values)
+{
+	assert(params_vec2.count(key) == 0);
+	params_vec2[key] = values;
+}
+
+void Effect::register_vec3(const string &key, float *values)
 {
 	assert(params_vec3.count(key) == 0);
 	params_vec3[key] = values;
 }
 
+void Effect::register_vec4(const string &key, float *values)
+{
+	assert(params_vec4.count(key) == 0);
+	params_vec4[key] = values;
+}
+
 // Output convenience uniforms for each parameter.
 // These will be filled in per-frame.
-std::string Effect::output_convenience_uniforms()
+string Effect::output_convenience_uniforms() const
 {
-	std::string output = "";
-	for (std::map<std::string, float*>::const_iterator it = params_float.begin();
+	string output = "";
+	for (map<string, float*>::const_iterator it = params_float.begin();
 	     it != params_float.end();
 	     ++it) {
 		char buf[256];
 		sprintf(buf, "uniform float PREFIX(%s);\n", it->first.c_str());
 		output.append(buf);
 	}
-	for (std::map<std::string, float*>::const_iterator it = params_vec3.begin();
+	for (map<string, float*>::const_iterator it = params_vec2.begin();
+	     it != params_vec2.end();
+	     ++it) {
+		char buf[256];
+		sprintf(buf, "uniform vec2 PREFIX(%s);\n", it->first.c_str());
+		output.append(buf);
+	}
+	for (map<string, float*>::const_iterator it = params_vec3.begin();
 	     it != params_vec3.end();
 	     ++it) {
 		char buf[256];
 		sprintf(buf, "uniform vec3 PREFIX(%s);\n", it->first.c_str());
 		output.append(buf);
 	}
+	for (map<string, float*>::const_iterator it = params_vec4.begin();
+	     it != params_vec4.end();
+	     ++it) {
+		char buf[256];
+		sprintf(buf, "uniform vec4 PREFIX(%s);\n", it->first.c_str());
+		output.append(buf);
+	}
 	return output;
 }
 
-void Effect::set_uniforms(GLhandleARB glsl_program_num, const std::string& prefix)
+void Effect::set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)
 {
-	for (std::map<std::string, float*>::const_iterator it = params_float.begin();
+	for (map<string, float*>::const_iterator it = params_float.begin();
 	     it != params_float.end();
 	     ++it) {
 		set_uniform_float(glsl_program_num, prefix, it->first, *it->second);
 	}
-	for (std::map<std::string, float*>::const_iterator it = params_vec3.begin();
+	for (map<string, float*>::const_iterator it = params_vec2.begin();
+	     it != params_vec2.end();
+	     ++it) {
+		set_uniform_vec2(glsl_program_num, prefix, it->first, it->second);
+	}
+	for (map<string, float*>::const_iterator it = params_vec3.begin();
 	     it != params_vec3.end();
 	     ++it) {
 		set_uniform_vec3(glsl_program_num, prefix, it->first, it->second);
 	}
+	for (map<string, float*>::const_iterator it = params_vec4.begin();
+	     it != params_vec4.end();
+	     ++it) {
+		set_uniform_vec4(glsl_program_num, prefix, it->first, it->second);
+	}
 }
+
+void Effect::clear_gl_state() {}
+
+}  // namespace movit