X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=blur_effect.h;h=8ad3da92dc27bb0f164184b04c042de569714038;hp=9bacd535efb69ffdbf39192f8b678c00fec472c8;hb=90ac46cdc5845432df13385f946c63b5496c685e;hpb=3d1f6c11c53cd9d3d5c1fb60f4accf050b7f135e

diff --git a/blur_effect.h b/blur_effect.h
index 9bacd53..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,21 +8,39 @@
 // 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 {
 public:
 	BlurEffect();
 
+	virtual std::string effect_type_id() const { return "BlurEffect"; }
+
 	// We want this for the same reason as ResizeEffect; we could end up scaling
 	// down quite a lot.
 	virtual bool needs_texture_bounce() const { return true; }
 	virtual bool needs_mipmaps() const { return true; }
 	virtual bool needs_srgb_primaries() const { return false; }
 
+	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
+
 	virtual std::string output_fragment_shader() {
 		assert(false);
 	}
@@ -30,30 +48,48 @@ public:
 		assert(false);
 	}
 
-	virtual void add_self_to_effect_chain(EffectChain *chain, const std::vector<Effect *> &input);
+	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;
 };
 
 class SingleBlurPassEffect : public Effect {
 public:
-	SingleBlurPassEffect();
+	// 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();
 
 	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) {
+			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) const {
+	virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const {
 		*width = this->width;
 		*height = this->height;
+		*virtual_width = this->virtual_width;
+		*virtual_height = this->virtual_height;
 	}
 
 	void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
@@ -62,9 +98,14 @@ public:
 	enum Direction { HORIZONTAL = 0, VERTICAL = 1 };
 
 private:
+	BlurEffect *parent;
+	int num_taps;
 	float radius;
 	Direction direction;
-	int width, height;
+	int width, height, virtual_width, virtual_height;
+	float *uniform_samples;
 };
 
-#endif // !defined(_BLUR_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_BLUR_EFFECT_H)