X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=1847f4831f4792b73edc62fcf6f4df07c60406c3;hp=1bbb89f08417821b9ffbdd2759763cd4517d3a9a;hb=8120b8fad20a35936c7d3316d5564af446a20c0f;hpb=d3cf1194740dbecde06f5e721a7e1910437a7666

diff --git a/effect.cpp b/effect.cpp
index 1bbb89f..1847f48 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,54 @@ 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 Matrix3x3 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 i = 0; i < 9; ++i) {
+		matrixf[i] = matrix[i];
+	}
+
+	glUniformMatrix3fv(location, 1, GL_FALSE, matrixf);
 	check_error();
 }
 
@@ -170,11 +174,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