X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=91b8e29f2c5fe12b5405e9778a3a3c948fab1d01;hp=5e3b93dc15a82a391d6b8344908d84607ed75f12;hb=5aae6761385e1d64cb21b8c902f6b47b4f22690a;hpb=d3cf1194740dbecde06f5e721a7e1910437a7666

diff --git a/effect_chain.h b/effect_chain.h
index 5e3b93d..91b8e29 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -63,10 +63,11 @@ private:
 	struct Phase {
 		GLint glsl_program_num;
 		bool input_needs_mipmaps;
-		std::vector<Effect *> inputs;
+		std::vector<Effect *> inputs;   // Only from other phases; input textures are not counted here.
 		std::vector<Effect *> effects;  // In order.
 	};
 
+	void set_use_srgb_texture_format(Effect *effect);
 	Effect *normalize_to_linear_gamma(Effect *input);
 	Effect *normalize_to_srgb(Effect *input);
 
@@ -77,11 +78,12 @@ private:
 
 	// 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);
+	void construct_glsl_programs(Effect *output);
 
 	unsigned width, height;
-	ImageFormat input_format, output_format;
-	std::vector<Effect *> effects, unexpanded_effects;
+	ImageFormat output_format;
+	std::vector<Effect *> effects;
+	std::vector<Input *> inputs;  // Also contained in effects.
 	std::map<Effect *, std::string> effect_ids;
 	std::map<Effect *, GLuint> effect_output_textures;
 	std::map<Effect *, std::vector<Effect *> > outgoing_links;