X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.cpp;h=483828bda88fcabb03b1da4ec23946f4ccab274e;hp=39e949078390e1bb21210e7ac586f3abad053b98;hb=4e1cc130959901f8be5566eacf7ecadbc7e0e9b2;hpb=524148c91130cbbe1a506eb9c268750dba74cb95

diff --git a/effect.cpp b/effect.cpp
index 39e9490..483828b 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,104 +1,13 @@
+#include <GL/glew.h>
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
-#include <GL/glew.h>
+#include <utility>
 
 #include "effect.h"
-#include "effect_chain.h"
+#include "effect_util.h"
 #include "util.h"
 
-GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)
-{
-	std::string name = prefix + "_" + key;
-	return glGetUniformLocation(glsl_program_num, name.c_str());
-}
-
-void set_uniform_int(GLuint glsl_program_num, const std::string &prefix, const std::string &key, int value)
-{
-	GLint location = get_uniform_location(glsl_program_num, prefix, key);
-	if (location == -1) {
-		return;
-	}
-	check_error();
-	glUniform1i(location, value);
-	check_error();
-}
-
-void set_uniform_float(GLuint glsl_program_num, const std::string &prefix, const std::string &key, float value)
-{
-	GLint location = get_uniform_location(glsl_program_num, prefix, key);
-	if (location == -1) {
-		return;
-	}
-	check_error();
-	glUniform1f(location, value);
-	check_error();
-}
-
-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();
-	glUniform2fv(location, 1, values);
-	check_error();
-}
-
-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();
-	glUniform3fv(location, 1, values);
-	check_error();
-}
-
-void set_uniform_vec4(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();
-	glUniform4fv(location, 1, 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)
-{
-	GLint location = get_uniform_location(glsl_program_num, prefix, key);
-	if (location == -1) {
-		return;
-	}
-	check_error();
-	glUniform4fv(location, num_values, values);
-	check_error();
-}
-
-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();
-
-	// 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();
-}
-
 bool Effect::set_int(const std::string &key, int value)
 {
 	if (params_int.count(key) == 0) {