X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=blur_effect.h;h=8ad3da92dc27bb0f164184b04c042de569714038;hp=792014b9214a7e7390a53762dcc5fe0992df101f;hb=90ac46cdc5845432df13385f946c63b5496c685e;hpb=2322070a3dbeb6b46b39cca07a0fbf20e95f5468

diff --git a/blur_effect.h b/blur_effect.h
index 792014b..8ad3da9 100644
--- 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 {
@@ -24,7 +38,6 @@ public:
 	virtual bool needs_texture_bounce() const { return true; }
 	virtual bool needs_mipmaps() const { return true; }
 	virtual bool needs_srgb_primaries() const { return false; }
-	virtual AlphaHandling alpha_handling() const { return INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED; }
 
 	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
@@ -37,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;
@@ -51,6 +66,7 @@ public:
 	// If parent is non-NULL, 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();
@@ -58,6 +74,7 @@ public:
 	virtual bool needs_texture_bounce() const { return true; }
 	virtual bool needs_mipmaps() const { return true; }
 	virtual bool needs_srgb_primaries() const { return false; }
+	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) {
@@ -65,6 +82,8 @@ public:
 		}
 	}
 	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)