X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=989a0199e460689110a709c5d508284bc9e35f4a;hp=cf96293b7ebc79a0c4619201399eb254626f7be7;hb=24c005b80fcd13ceb3460e9957fec646eec2b0ee;hpb=e655afd53f2e56938bd4e7f72640eff56ef4a1ee

diff --git a/effect_chain.h b/effect_chain.h
index cf96293..989a019 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -25,8 +25,15 @@ private:
 	// Identifier used to create unique variables in GLSL.
 	std::string effect_id;
 
+	// Logical size of the output of this effect, ie. the resolution
+	// you would get if you sampled it as a texture. If it is undefined
+	// (since the inputs differ in resolution), it will be 0x0.
+	// If both this and output_texture_{width,height} are set,
+	// they will be equal.
+	unsigned output_width, output_height;
+
 	// If output goes to RTT (otherwise, none of these are set).
-	// The Phsae pointer is a but ugly; we should probably fix so
+	// The Phase 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;
@@ -54,7 +61,7 @@ struct Phase {
 
 class EffectChain {
 public:
-	EffectChain(unsigned width, unsigned height);
+	EffectChain(float aspect_nom, float aspect_denom);  // E.g., 16.0f, 9.0f for 16:9.
 
 	// User API:
 	// input, effects, output, finalize need to come in that specific order.
@@ -85,7 +92,14 @@ public:
 	void finalize();
 
 	//void render(unsigned char *src, unsigned char *dst);
-	void render_to_screen();
+	void render_to_screen()
+	{
+		render_to_fbo(0, 0, 0);
+	}
+
+	// Render the effect chain to the given FBO. If width=height=0, keeps
+	// the current viewport.
+	void render_to_fbo(GLuint fbo, unsigned width, unsigned height);
 
 	Effect *last_added_effect() {
 		if (nodes.empty()) {
@@ -107,6 +121,14 @@ public:
 	void insert_node_between(Node *sender, Node *middle, Node *receiver);
 
 private:
+	// Fits a rectangle of the given size to the current aspect ratio
+	// (aspect_nom/aspect_denom) and returns the new width and height.
+	unsigned fit_rectangle_to_aspect(unsigned width, unsigned height);
+
+	// Compute the input sizes for all inputs for all effects in a given phase,
+	// and inform the effects about the results.	
+	void inform_input_sizes(Phase *phase);
+
 	// 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);
@@ -146,7 +168,7 @@ private:
 	void fix_internal_gamma_by_inserting_nodes(unsigned step);
 	void fix_output_gamma();
 
-	unsigned width, height;
+	float aspect_nom, aspect_denom;
 	ImageFormat output_format;
 
 	std::vector<Node *> nodes;