Actually implement multiple inputs to phases. Surprising amounts of stuff needed...

[movit] / blur_effect.h

diff --git a/blur_effect.h b/blur_effect.h
index ee890c25543fa41599e67d3e9284bfd68d8ee196..d90f99aeaf75bb9a8de28bcfe3e0ec48bb141c74 100644 (file)
--- a/blur_effect.h
+++ b/blur_effect.h
@@ -1,6 +1,14 @@
 #ifndef _BLUR_EFFECT_H
 #define _BLUR_EFFECT_H 1
 
 #ifndef _BLUR_EFFECT_H
 #define _BLUR_EFFECT_H 1
 

+// A separable 2D blur implemented by a combination of mipmap filtering
+// and convolution (essentially giving a convolution with a piecewise linear
+// approximation to the true impulse response).
+//
+// Works in two passes; first horizontal, then vertical (BlurEffect,
+// which is what the user is intended to use, instantiates two copies of
+// SingleBlurPassEffect behind the scenes).
+

 #include "effect.h"
 
 class SingleBlurPassEffect;
 #include "effect.h"
 
 class SingleBlurPassEffect;


@@ -16,9 +24,9 @@ public:
                assert(false);
        }
 
                assert(false);
        }
 

-       virtual bool needs_many_samples() const { return true; }
+       virtual bool needs_texture_bounce() const { return true; }

        virtual bool needs_mipmaps() const { return true; }
        virtual bool needs_mipmaps() const { return true; }

-       virtual void add_self_to_effect_chain(std::vector<Effect *> *chain);
+       virtual void add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &input);

        virtual bool set_float(const std::string &key, float value);
        
 private:
        virtual bool set_float(const std::string &key, float value);
        
 private:


@@ -30,7 +38,7 @@ public:
        SingleBlurPassEffect();
        std::string output_fragment_shader();
 
        SingleBlurPassEffect();
        std::string output_fragment_shader();
 

-       virtual bool needs_many_samples() const { return true; }
+       virtual bool needs_texture_bounce() const { return true; }

        virtual bool needs_mipmaps() const { return true; }
 
        void set_uniforms(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
        virtual bool needs_mipmaps() const { return true; }
 
        void set_uniforms(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);