X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=9ff200bacde5d01258ffa2b7040181f266824efa;hp=3128f0d657b74e851d18f506b94425a28cf6aa87;hb=f653817a84050a9b12c953eadd2999c8642ee025;hpb=f6acc0d1d488567e651220ffd327591c1443f49b

diff --git a/effect.cpp b/effect.cpp
index 3128f0d..9ff200b 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,5 +1,3 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -7,8 +5,7 @@
 #include "effect_chain.h"
 #include "util.h"
 
-#include <GL/gl.h>
-#include <GL/glext.h>
+#include "opengl.h"
 
 GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)
 {
@@ -38,47 +35,56 @@ void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const
 	check_error();
 }
 
-void set_uniform_float_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
+void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
 		return;
 	}
 	check_error();
-	glUniform1fv(location, num_values, values);
+	glUniform2fv(location, 1, values);
 	check_error();
 }
 
-void set_uniform_vec2(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
 		return;
 	}
 	check_error();
-	glUniform2fv(location, 1, values);
+	glUniform3fv(location, 1, values);
 	check_error();
 }
 
-void set_uniform_vec3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values)
+void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
 		return;
 	}
 	check_error();
-	glUniform3fv(location, 1, values);
+	glUniform4fv(location, num_values, values);
 	check_error();
 }
 
-void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values)
+void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const Eigen::Matrix3d& matrix)
 {
 	GLint location = get_uniform_location(glsl_program_num, prefix, key);
 	if (location == -1) {
 		return;
 	}
 	check_error();
-	glUniform4fv(location, num_values, values);
+
+	// Convert to float (GLSL has no double matrices).
+	float matrixf[9];
+	for (unsigned y = 0; y < 3; ++y) {
+		for (unsigned x = 0; x < 3; ++x) {
+			matrixf[y + x * 3] = matrix(y, x);
+		}
+	}
+
+	glUniformMatrix3fv(location, 1, GL_FALSE, matrixf);
 	check_error();
 }
 
@@ -170,11 +176,6 @@ void Effect::invalidate_1d_texture(const std::string &key)
 	params_tex_1d[key].needs_update = true;
 }
 
-void Effect::add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &inputs)
-{
-	chain->add_effect_raw(this, inputs);
-}
-
 // Output convenience uniforms for each parameter.
 // These will be filled in per-frame.
 std::string Effect::output_convenience_uniforms() const
@@ -229,7 +230,7 @@ void Effect::set_gl_state(GLuint glsl_program_num, const std::string& prefix, un
 		set_uniform_vec3(glsl_program_num, prefix, it->first, it->second);
 	}
 
-	for (std::map<std::string, Texture1D>::const_iterator it = params_tex_1d.begin();
+	for (std::map<std::string, Texture1D>::iterator it = params_tex_1d.begin();
 	     it != params_tex_1d.end();
 	     ++it) {
 		glActiveTexture(GL_TEXTURE0 + *sampler_num);