X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=0abd51805793a2d40b4b9fd0f5394a056bad7dc0;hp=045c9aa7832f7885570eccd69d7670ce39d92e28;hb=45636792070587fb38cc84927f4e3d9c2ce8bd33;hpb=f6c44598c9dad9ddd024c5f8f010d179a6d971fd

diff --git a/effect_chain.h b/effect_chain.h
index 045c9aa..0abd518 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -1,65 +1,145 @@
 #ifndef _EFFECT_CHAIN_H
 #define _EFFECT_CHAIN_H 1
 
+#include <set>
 #include <vector>
 
 #include "effect.h"
-#include "effect_id.h"
+#include "image_format.h"
+#include "input.h"
 
-enum PixelFormat { FORMAT_RGB, FORMAT_RGBA };
+class EffectChain;
+class Phase;
 
-enum ColorSpace {
-	COLORSPACE_sRGB = 0,
-	COLORSPACE_REC_709 = 0,  // Same as sRGB.
-	COLORSPACE_REC_601_525 = 1,
-	COLORSPACE_REC_601_625 = 2,
-};
+// A node in the graph; basically an effect and some associated information.
+class Node {
+public:
+	Effect *effect;
+
+	// Edges in the graph (forward and backward).
+	std::vector<Node *> outgoing_links;
+	std::vector<Node *> incoming_links;
+
+private:
+	// Identifier used to create unique variables in GLSL.
+	std::string effect_id;
+
+	// If output goes to RTT (otherwise, none of these are set).
+	// The Phsae pointer is a but ugly; we should probably fix so
+	// that Phase takes other phases as inputs, instead of Node.
+	GLuint output_texture;
+	unsigned output_texture_width, output_texture_height;
+	Phase *phase;
 
-enum GammaCurve {
-	GAMMA_LINEAR = 0,
-	GAMMA_sRGB = 1,
-	GAMMA_REC_601 = 2,
-	GAMMA_REC_709 = 2,  // Same as Rec. 601.
+	// Used during the building of the effect chain.
+	ColorSpace output_color_space;
+	GammaCurve output_gamma_curve;
+
+	friend class EffectChain;
 };
 
-struct ImageFormat {
-	PixelFormat pixel_format;
-	ColorSpace color_space;
-	GammaCurve gamma_curve;
+// A rendering phase; a single GLSL program rendering a single quad.
+struct Phase {
+	GLint glsl_program_num;
+	bool input_needs_mipmaps;
+
+	// Inputs are only inputs from other phases (ie., those that come from RTT);
+	// input textures are not counted here.
+	std::vector<Node *> inputs;
+
+	std::vector<Node *> effects;  // In order.
+	unsigned output_width, output_height;
 };
 
 class EffectChain {
 public:
 	EffectChain(unsigned width, unsigned height);
 
+	// User API:
 	// input, effects, output, finalize need to come in that specific order.
 
-	void add_input(const ImageFormat &format);
-
-	// The returned pointer is owned by EffectChain.
-	Effect *add_effect(EffectId effect);
+	// EffectChain takes ownership of the given input.
+	// input is returned back for convenience.
+	Input *add_input(Input *input);
+
+	// EffectChain takes ownership of the given effect.
+	// effect is returned back for convenience.
+	Effect *add_effect(Effect *effect) {
+		return add_effect(effect, last_added_effect());
+	}
+	Effect *add_effect(Effect *effect, Effect *input) {
+		std::vector<Effect *> inputs;
+		inputs.push_back(input);
+		return add_effect(effect, inputs);
+	}
+	Effect *add_effect(Effect *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(Effect *effect, const std::vector<Effect *> &inputs);
+
+	// Similar to add_effect, but:
+	//
+	//  * Does not insert any normalizing effects.
+	//  * Does not ask the effect to insert itself, so it won't work
+	//    with meta-effects.
+	//
+	// We should really separate out these two “sides” of Effect in the
+	// type system soon.
+	void add_effect_raw(Effect *effect, const std::vector<Effect *> &inputs);
 
 	void add_output(const ImageFormat &format);
 	void finalize();
 
 	//void render(unsigned char *src, unsigned char *dst);
-	void render_to_screen(unsigned char *src);
+	void render_to_screen();
+
+	Effect *last_added_effect() {
+		if (nodes.empty()) {
+			return NULL;
+		} else {
+			return nodes.back()->effect;
+		}	
+	}
 
 private:
-	void normalize_to_linear_gamma();
-	void normalize_to_srgb();
+	// Determine the preferred output size of a given phase.
+	// Requires that all input phases (if any) already have output sizes set.
+	void find_output_size(Phase *phase);
+
+	void find_all_nonlinear_inputs(Node *effect,
+	                               std::vector<Node *> *nonlinear_inputs,
+	                               std::vector<Node *> *intermediates);
+	Node *normalize_to_linear_gamma(Node *input);
+	Node *normalize_to_srgb(Node *input);
+
+	// Create a GLSL program computing the given effects in order.
+	Phase *compile_glsl_program(const std::vector<Node *> &inputs,
+	                            const std::vector<Node *> &effects);
+
+	// Create all GLSL programs needed to compute the given effect, and all outputs
+	// that depends on it (whenever possible).
+	void construct_glsl_programs(Node *output);
+
+	// Output the current graph to the given file in a Graphviz-compatible format;
+	// only useful for debugging.
+	void output_dot(const char *filename);
 
 	unsigned width, height;
-	ImageFormat input_format, output_format;
-	std::vector<Effect *> effects;
+	ImageFormat output_format;
 
-	int glsl_program_num;
-	bool finalized;
+	std::vector<Node *> nodes;
+	std::map<Effect *, Node *> node_map;
 
-	// Used during the building of the effect chain.
-	ColorSpace current_color_space;
-	GammaCurve current_gamma_curve;	
-};
+	std::vector<Input *> inputs;  // Also contained in nodes.
+
+	GLuint fbo;
+	std::vector<Phase *> phases;
 
+	GLenum format, bytes_per_pixel;
+	bool finalized;
+};
 
 #endif // !defined(_EFFECT_CHAIN_H)