X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=effect_chain.h;h=dc52d3e4a3655ee14a7c3b03c248228d3e573ab9;hb=b0f2d8f7604bfb4c8a9824a3a022d32ef26e12cc;hp=a22e96ad98629bc5e4980836b2eb563bd266a8e0;hpb=879854382e1f6db14812cd6bd5390ca01f4b1d5a;p=movit

diff --git a/effect_chain.h b/effect_chain.h
index a22e96a..dc52d3e 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -1,6 +1,7 @@
 #ifndef _EFFECT_CHAIN_H
 #define _EFFECT_CHAIN_H 1
 
+#include <set>
 #include <vector>
 
 #include "effect.h"
@@ -41,7 +42,18 @@ public:
 	Effect *add_effect(EffectId effect) {
 		return add_effect(effect, get_last_added_effect());
 	}
-	Effect *add_effect(EffectId effect, Effect *input);
+	Effect *add_effect(EffectId effect, Effect *input) {
+		std::vector<Effect *> inputs;
+		inputs.push_back(input);
+		return add_effect(effect, inputs);
+	}
+	Effect *add_effect(EffectId effect, Effect *input1, Effect *input2) {
+		std::vector<Effect *> inputs;
+		inputs.push_back(input1);
+		inputs.push_back(input2);
+		return add_effect(effect, inputs);
+	}
+	Effect *add_effect(EffectId effect, const std::vector<Effect *> &inputs);
 
 	// Similar to add_effect, but:
 	//
@@ -51,7 +63,7 @@ public:
 	//
 	// We should really separate out these two “sides” of Effect in the
 	// type system soon.
-	void add_effect_raw(Effect *effect, Effect *input);
+	void add_effect_raw(Effect *effect, const std::vector<Effect *> &inputs);
 
 	void add_output(const ImageFormat &format);
 	void finalize();
@@ -67,36 +79,43 @@ private:
 	struct Phase {
 		GLint glsl_program_num;
 		bool input_needs_mipmaps;
-		unsigned start, end;
+		std::vector<Effect *> inputs;
+		std::vector<Effect *> effects;  // In order.
 	};
 
 	Effect *normalize_to_linear_gamma(Effect *input);
 	Effect *normalize_to_srgb(Effect *input);
 
-	// Create a GLSL program computing effects [start, end>.
-	Phase compile_glsl_program(unsigned start_index, unsigned end_index);
+	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);
+
+	// Create all GLSL programs needed to compute the given effect, and all outputs
+	// that depends on it (whenever possible).
+	void construct_glsl_programs(Effect *start, std::set<Effect *> *completed_effects);
 
 	unsigned width, height;
 	ImageFormat input_format, output_format;
-	std::vector<Effect *> effects;
-	std::multimap<Effect *, Effect *> outgoing_links;
-	std::multimap<Effect *, Effect *> incoming_links;
+	std::vector<Effect *> effects, unexpanded_effects;
+	std::map<Effect *, std::string> effect_ids;
+	std::map<Effect *, GLuint> effect_output_textures;
+	std::map<Effect *, std::vector<Effect *> > outgoing_links;
+	std::map<Effect *, std::vector<Effect *> > incoming_links;
 	Effect *last_added_effect;
 
 	GLuint source_image_num;
 	bool use_srgb_texture_format;
 
 	GLuint fbo;
-	GLuint temp_textures[2];
-
 	std::vector<Phase> phases;
 
 	GLenum format, bytes_per_pixel;
 	bool finalized;
 
 	// Used during the building of the effect chain.
-	ColorSpace current_color_space;
-	GammaCurve current_gamma_curve;	
+	std::map<Effect *, ColorSpace> output_color_space;
+	std::map<Effect *, GammaCurve> output_gamma_curve;	
 };