Do some more cleanups in anticipation of more flexible compute shader outputs.

[movit] / blur_effect.h

diff --git a/blur_effect.h b/blur_effect.h
index 76f7389d1568739a3312df999c64e20857728367..69bd663cd27b9b518497a35998d06a6a5260d93e 100644 (file)
--- a/blur_effect.h
+++ b/blur_effect.h
@@ -1,5 +1,5 @@
-#ifndef _BLUR_EFFECT_H
-#define _BLUR_EFFECT_H 1
+#ifndef _MOVIT_BLUR_EFFECT_H
+#define _MOVIT_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
@@ -8,9 +8,23 @@
 // 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).
+//
+// The recommended number of taps is the default (16). Fewer will be faster
+// but uglier; a tradeoff that might be worth it as part of more complicated
+// effects. This can be set only before finalization, and must be an
+// even number.
+
+#include <epoxy/gl.h>
+#include <assert.h>
+#include <stddef.h>
+#include <string>
 
 #include "effect.h"
 
+namespace movit {
+
+class EffectChain;
+class Node;
 class SingleBlurPassEffect;
 
 class BlurEffect : public Effect {
@@ -36,10 +50,12 @@ public:
 
        virtual void rewrite_graph(EffectChain *graph, Node *self);
        virtual bool set_float(const std::string &key, float value);
+       virtual bool set_int(const std::string &key, int value);
        
 private:
        void update_radius();
-       
+
+       int num_taps;
        float radius;
        SingleBlurPassEffect *hpass, *vpass;
        unsigned input_width, input_height;
@@ -47,9 +63,10 @@ private:
 
 class SingleBlurPassEffect : public Effect {
 public:
-       // If parent is non-NULL, calls to inform_input_size will be forwarded
+       // If parent is non-nullptr, calls to inform_input_size will be forwarded
        // so that it can make reasonable decisions for both blur passes.
        SingleBlurPassEffect(BlurEffect *parent);
+       virtual ~SingleBlurPassEffect();
        virtual std::string effect_type_id() const { return "SingleBlurPassEffect"; }
 
        std::string output_fragment_shader();
@@ -60,11 +77,13 @@ public:
        virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
        virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
-               if (parent != NULL) {
+               if (parent != nullptr) {
                        parent->inform_input_size(input_num, width, height);
                }
        }
        virtual bool changes_output_size() const { return true; }
+       virtual bool sets_virtual_output_size() const { return true; }
+       virtual bool one_to_one_sampling() const { return false; }  // Can sample outside the border.
 
        virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const {
                *width = this->width;
@@ -80,9 +99,13 @@ public:
 
 private:
        BlurEffect *parent;
+       int num_taps;
        float radius;
        Direction direction;
        int width, height, virtual_width, virtual_height;
+       float *uniform_samples;
 };
 
-#endif // !defined(_BLUR_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_BLUR_EFFECT_H)