Make the blur use the resize functionality, which also unbreaks the in-between sampli...

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index f9e1255566fbcf5522de9a58d34b2f52a83154af..dcfb7a13667759c502d9860f9aca456a5ce641d9 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -15,7 +15,9 @@ public:
        // User API:
        // input, effects, output, finalize need to come in that specific order.
 
-       Input *add_input(const ImageFormat &format);
+       // EffectChain takes ownership of the given input.
+       // input is returned back for convenience.
+       Input *add_input(Input *input);
 
        // EffectChain takes ownership of the given effect.
        // effect is returned back for convenience.
@@ -65,16 +67,23 @@ private:
                bool input_needs_mipmaps;
                std::vector<Effect *> inputs;   // Only from other phases; input textures are not counted here.
                std::vector<Effect *> effects;  // In order.
+               unsigned output_width, output_height;
        };
 
-       void set_use_srgb_texture_format(Effect *effect);
+       // Determine the preferred output size of a given phase.
+       // Requires that all input phases (if any) already have output sizes set.
+       void find_output_size(Phase *phase);
+
+       void find_all_nonlinear_inputs(Effect *effect,
+                                      std::vector<Input *> *nonlinear_inputs,
+                                      std::vector<Effect *> *intermediates);
        Effect *normalize_to_linear_gamma(Effect *input);
        Effect *normalize_to_srgb(Effect *input);
 
        void draw_vertex(float x, float y, const std::vector<Effect *> &inputs);
 
        // Create a GLSL program computing the given effects in order.
-       Phase compile_glsl_program(const std::vector<Effect *> &inputs, const std::vector<Effect *> &effects);
+       Phase *compile_glsl_program(const std::vector<Effect *> &inputs, const std::vector<Effect *> &effects);
 
        // Create all GLSL programs needed to compute the given effect, and all outputs
        // that depends on it (whenever possible).
@@ -86,11 +95,16 @@ private:
        std::vector<Input *> inputs;  // Also contained in effects.
        std::map<Effect *, std::string> effect_ids;
        std::map<Effect *, GLuint> effect_output_textures;
+       std::map<Effect *, std::pair<GLuint, GLuint> > effect_output_texture_sizes;
        std::map<Effect *, std::vector<Effect *> > outgoing_links;
        std::map<Effect *, std::vector<Effect *> > incoming_links;
 
        GLuint fbo;
-       std::vector<Phase> phases;
+       std::vector<Phase *> phases;
+
+       // This is a bit ugly; we should probably fix so that Phase takes other phases
+       // as inputs, instead of Effect.
+       std::map<Effect *, Phase *> output_effects_to_phase;
 
        GLenum format, bytes_per_pixel;
        bool finalized;