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

diff --git a/effect_chain.h b/effect_chain.h
index 9d389d5..0abd518 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -8,6 +8,49 @@
 #include "image_format.h"
 #include "input.h"
 
+class EffectChain;
+class Phase;
+
+// 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;
+
+	// Used during the building of the effect chain.
+	ColorSpace output_color_space;
+	GammaCurve output_gamma_curve;
+
+	friend class EffectChain;
+};
+
+// 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);
@@ -62,44 +105,6 @@ public:
 	}
 
 private:
-	struct Phase;
-
-	// A node in the graph; basically an effect and some associated information.
-	struct Node {
-		Effect *effect;
-
-		// Identifier used to create unique variables in GLSL.
-		std::string effect_id;
-
-		// Edges in the graph (forward and backward).
-		std::vector<Node *> outgoing_links;
-		std::vector<Node *> incoming_links;
-
-		// 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;
-
-		// Used during the building of the effect chain.
-		ColorSpace output_color_space;
-		GammaCurve output_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;
-	};
-
 	// 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);
@@ -110,8 +115,6 @@ private:
 	Node *normalize_to_linear_gamma(Node *input);
 	Node *normalize_to_srgb(Node *input);
 
-	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<Node *> &inputs,
 	                            const std::vector<Node *> &effects);
@@ -120,6 +123,10 @@ private:
 	// 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 output_format;
 
@@ -135,5 +142,4 @@ private:
 	bool finalized;
 };
 
-
 #endif // !defined(_EFFECT_CHAIN_H)