Defer fetching inputs' color spaces and gamma to finalize().

[movit] / effect.cpp

diff --git a/effect.cpp b/effect.cpp
index 1847f4831f4792b73edc62fcf6f4df07c60406c3..384e8c2944e741ce53bade017d4e7b9064148228 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,12 +1,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <GL/glew.h>
+
 #include "effect.h"
 #include "effect_chain.h"
 #include "util.h"
 
-#include "opengl.h"
-
 GLint get_uniform_location(GLuint glsl_program_num, const std::string &prefix, const std::string &key)
 {
        std::string name = prefix + "_" + key;
@@ -68,7 +68,7 @@ void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix,
        check_error();
 }
 
-void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const Matrix3x3 matrix)
+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) {
@@ -78,8 +78,10 @@ void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const
 
        // Convert to float (GLSL has no double matrices).
        float matrixf[9];
-       for (unsigned i = 0; i < 9; ++i) {
-               matrixf[i] = matrix[i];
+       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);