Kill the hard-coded texture enums (yay).

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 9eee1f66faaf1622715002d44edd195708cfc9fc..a6ff90ea5a7df7ad8cfda34dcd68894c47792cf6 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -14,8 +14,8 @@
 #include "lift_gamma_gain_effect.h"
 #include "colorspace_conversion_effect.h"
 #include "saturation_effect.h"
+#include "mirror_effect.h"
 #include "vignette_effect.h"
-#include "texture_enum.h"
 
 EffectChain::EffectChain(unsigned width, unsigned height)
        : width(width), height(height), use_srgb_texture_format(false), finalized(false) {}
@@ -45,6 +45,8 @@ Effect *instantiate_effect(EffectId effect)
                return new LiftGammaGainEffect();
        case EFFECT_SATURATION:
                return new SaturationEffect();
+       case EFFECT_MIRROR:
+               return new MirrorEffect();
        case EFFECT_VIGNETTE:
                return new VignetteEffect();
        }
@@ -155,9 +157,8 @@ void EffectChain::finalize()
                effects.push_back(gamma_conversion);
                current_gamma_curve = output_format.gamma_curve;
        }
-
-       std::string frag_shader = read_file("header.glsl");
-
+       
+       std::string frag_shader = read_file("header.frag");
        for (unsigned i = 0; i < effects.size(); ++i) {
                char effect_id[256];
                sprintf(effect_id, "eff%d", i);
@@ -165,18 +166,18 @@ void EffectChain::finalize()
                frag_shader += "\n";
                frag_shader += std::string("#define FUNCNAME ") + effect_id + "\n";
                frag_shader += replace_prefix(effects[i]->output_convenience_uniforms(), effect_id);
-               frag_shader += replace_prefix(effects[i]->output_glsl(), effect_id);
+               frag_shader += replace_prefix(effects[i]->output_fragment_shader(), effect_id);
                frag_shader += "#undef PREFIX\n";
                frag_shader += "#undef FUNCNAME\n";
                frag_shader += "#undef LAST_INPUT\n";
                frag_shader += std::string("#define LAST_INPUT ") + effect_id + "\n";
                frag_shader += "\n";
        }
-       frag_shader.append(read_file("footer.glsl"));
+       frag_shader.append(read_file("footer.frag"));
        printf("%s\n", frag_shader.c_str());
        
        glsl_program_num = glCreateProgram();
-       GLuint vs_obj = compile_shader(read_file("vs.glsl"), GL_VERTEX_SHADER);
+       GLuint vs_obj = compile_shader(read_file("vs.vert"), GL_VERTEX_SHADER);
        GLuint fs_obj = compile_shader(frag_shader, GL_FRAGMENT_SHADER);
        glAttachShader(glsl_program_num, vs_obj);
        check_error();
@@ -218,7 +219,11 @@ void EffectChain::finalize()
        memset(mapped_pbo, 0, width * height * bytes_per_pixel);
        glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB);
        
-       glBindTexture(GL_TEXTURE_2D, SOURCE_IMAGE);
+       glGenTextures(1, &source_image_num);
+       check_error();
+       glBindTexture(GL_TEXTURE_2D, source_image_num);
+       check_error();
+       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
        check_error();
        glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
        check_error();
@@ -243,7 +248,7 @@ void EffectChain::render_to_screen(unsigned char *src)
        // Re-upload the texture from the PBO.
        glActiveTexture(GL_TEXTURE0);
        check_error();
-       glBindTexture(GL_TEXTURE_2D, SOURCE_IMAGE);
+       glBindTexture(GL_TEXTURE_2D, source_image_num);
        check_error();
        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
        check_error();