X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=c38f34749cb89ff2a68fe67b61a62abcc5364983;hp=1c50b1631ba6c51db2231235b24a1cb33bb2f586;hb=ff9e68a3f5abb179bd7bf9fb84df48327f148583;hpb=048e90293b5f5ed4b922d60c4cb47c4b5d24b85e

diff --git a/effect_chain.h b/effect_chain.h
index 1c50b16..c38f347 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -40,7 +40,7 @@ private:
 	Phase *phase;
 
 	// Used during the building of the effect chain.
-	ColorSpace output_color_space;
+	Colorspace output_color_space;
 	GammaCurve output_gamma_curve;
 
 	friend class EffectChain;
@@ -48,7 +48,7 @@ private:
 
 // A rendering phase; a single GLSL program rendering a single quad.
 struct Phase {
-	GLint glsl_program_num;
+	GLint glsl_program_num, vertex_shader, fragment_shader;
 	bool input_needs_mipmaps;
 
 	// Inputs are only inputs from other phases (ie., those that come from RTT);
@@ -62,6 +62,7 @@ struct Phase {
 class EffectChain {
 public:
 	EffectChain(float aspect_nom, float aspect_denom);  // E.g., 16.0f, 9.0f for 16:9.
+	~EffectChain();
 
 	// User API:
 	// input, effects, output, finalize need to come in that specific order.
@@ -89,10 +90,27 @@ public:
 	Effect *add_effect(Effect *effect, const std::vector<Effect *> &inputs);
 
 	void add_output(const ImageFormat &format);
+
+	// Set number of output bits, to scale the dither.
+	// 8 is the right value for most outputs.
+	// The default, 0, is a special value that means no dither.
+	void set_dither_bits(unsigned num_bits)
+	{
+		this->num_dither_bits = num_bits;
+	}
+
 	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()) {
@@ -160,19 +178,22 @@ private:
 	void fix_internal_gamma_by_asking_inputs(unsigned step);
 	void fix_internal_gamma_by_inserting_nodes(unsigned step);
 	void fix_output_gamma();
+	void add_dither_if_needed();
 
 	float aspect_nom, aspect_denom;
 	ImageFormat output_format;
 
 	std::vector<Node *> nodes;
 	std::map<Effect *, Node *> node_map;
+	Effect *dither_effect;
 
 	std::vector<Input *> inputs;  // Also contained in nodes.
 
 	GLuint fbo;
 	std::vector<Phase *> phases;
 
-	GLenum format, bytes_per_pixel;
+	GLenum format;
+	unsigned bytes_per_pixel, num_dither_bits;
 	bool finalized;
 };