X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=cbc1221020bbfa0063767da30275ee7e45662891;hp=1078027a7bfc3b859531ddd6932ff79c96cc1795;hb=6462d4df1986c76e363cf21ee0c7734d1b312635;hpb=edb0700c0a8ea225ce9add1cb4f70d42af6de381

diff --git a/effect_chain.h b/effect_chain.h
index 1078027..cbc1221 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -26,6 +26,8 @@
 
 #include "image_format.h"
 
+namespace movit {
+
 class Effect;
 class Input;
 struct Phase;
@@ -57,9 +59,6 @@ public:
 	std::vector<Node *> incoming_links;
 
 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.
@@ -67,13 +66,20 @@ private:
 	// they will be equal.
 	unsigned output_width, output_height;
 
-	// If output goes to RTT (otherwise, none of these are set).
-	// 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;
+	// If output goes to RTT, which phase it is in (otherwise unset).
+	// This is a bit ugly; we should probably fix so that Phase takes other
+	// phases as inputs, instead of Node.
 	Phase *phase;
 
+	// If the effect has is_single_texture(), or if the output went to RTT
+	// and that texture has been bound to a sampler, the sampler number
+	// will be stored here.
+	//
+	// TODO: Can an RTT texture be used as inputs to multiple effects
+	// within the same phase? If so, we have a problem with modifying
+	// sampler state here.
+	int bound_sampler_num;
+
 	// Used during the building of the effect chain.
 	Colorspace output_color_space;
 	GammaCurve output_gamma_curve;
@@ -93,6 +99,10 @@ struct Phase {
 
 	std::vector<Node *> effects;  // In order.
 	unsigned output_width, output_height, virtual_output_width, virtual_output_height;
+
+	// Identifier used to create unique variables in GLSL.
+	// Unique per-phase to increase cacheability of compiled shaders.
+	std::map<Node *, std::string> effect_ids;
 };
 
 class EffectChain {
@@ -129,6 +139,13 @@ public:
 		inputs.push_back(input2);
 		return add_effect(effect, inputs);
 	}
+	Effect *add_effect(Effect *effect, Effect *input1, Effect *input2, Effect *input3) {
+		std::vector<Effect *> inputs;
+		inputs.push_back(input1);
+		inputs.push_back(input2);
+		inputs.push_back(input3);
+		return add_effect(effect, inputs);
+	}
 	Effect *add_effect(Effect *effect, const std::vector<Effect *> &inputs);
 
 	void add_output(const ImageFormat &format, OutputAlphaFormat alpha_format);
@@ -172,6 +189,22 @@ public:
 	void replace_receiver(Node *old_receiver, Node *new_receiver);
 	void replace_sender(Node *new_sender, Node *receiver);
 	void insert_node_between(Node *sender, Node *middle, Node *receiver);
+	Node *find_node_for_effect(Effect *effect) { return node_map[effect]; }
+
+	// Get the OpenGL sampler (GL_TEXTURE0, GL_TEXTURE1, etc.) for the
+	// input of the given node, so that one can modify the sampler state
+	// directly. Only valid to call during set_gl_state().
+	//
+	// Also, for this to be allowed, <node>'s effect must have
+	// needs_texture_bounce() set, so that it samples directly from a
+	// single-sampler input, or from an RTT texture.
+	GLenum get_input_sampler(Node *node, unsigned input_num) const;
+
+	// Get the current resource pool assigned to this EffectChain.
+	// Primarily to let effects allocate textures as needed.
+	// Any resources you get from the pool must be returned to the pool
+	// no later than in the Effect's destructor.
+	ResourcePool *get_resource_pool() { return resource_pool; }
 
 private:
 	// Make sure the output rectangle is at least large enough to hold
@@ -261,4 +294,6 @@ private:
 	bool owns_resource_pool;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_EFFECT_CHAIN_H)