Deallocation in YCbCrInput.

[movit] / effect.cpp

diff --git a/effect.cpp b/effect.cpp
index 4f2bfd616a3400f1ea3a6929ff5d755f3d9b0f2f..74bd939f3f1e811303519e4aaf5d5ed2dac615bb 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -1,13 +1,11 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include "effect.h"
+#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)
 {
@@ -81,6 +79,24 @@ 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)
+{
+       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 i = 0; i < 9; ++i) {
+               matrixf[i] = matrix[i];
+       }
+
+       glUniformMatrix3fv(location, 1, GL_FALSE, matrixf);
+       check_error();
+}
+
 bool Effect::set_int(const std::string &key, int value)
 {
        if (params_int.count(key) == 0) {
@@ -205,7 +221,7 @@ std::string Effect::output_convenience_uniforms() const
        return output;
 }
 
-void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
+void Effect::set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num)
 {
        for (std::map<std::string, float*>::const_iterator it = params_float.begin();
             it != params_float.end();
@@ -223,7 +239,7 @@ void Effect::set_uniforms(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);
@@ -234,9 +250,12 @@ void Effect::set_uniforms(GLuint glsl_program_num, const std::string& prefix, un
                if (it->second.needs_update) {
                        glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE16F_ARB, it->second.size, 0, GL_LUMINANCE, GL_FLOAT, it->second.values);
                        check_error();
+                       it->second.needs_update = false;
                }
 
                set_uniform_int(glsl_program_num, prefix, it->first, *sampler_num);
                ++*sampler_num;
        }
 }
+
+void Effect::clear_gl_state() {}