X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=2f088b607feeec92fd3bb98c69be5cafde2329dd;hp=02906fe0b9885b0263db412a16b3b4d0fd540031;hb=82071a94aaff95d2d29d077338085a8fb27e76d1;hpb=97f04cf3de39851ba0808aace31866afa9a9f500

diff --git a/effect_chain.h b/effect_chain.h
index 02906fe..2f088b6 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -16,6 +16,10 @@
 // but if so, the threads' contexts need to be set up to share resources, since
 // the EffectChain holds textures and other OpenGL objects that are tied to the
 // context.
+//
+// Memory management (only relevant if you use multiple contexts):
+// See corresponding comment in resource_pool.h. This holds even if you don't
+// allocate your own ResourcePool, but let EffectChain hold its own.
 
 #include <epoxy/gl.h>
 #include <stdio.h>
@@ -58,6 +62,10 @@ public:
 	std::vector<Node *> outgoing_links;
 	std::vector<Node *> incoming_links;
 
+	// For unit tests only. Do not use from other code.
+	// Will contain an arbitrary choice if the node is in multiple phases.
+	Phase *containing_phase;
+
 private:
 	// 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
@@ -66,11 +74,6 @@ private:
 	// they will be equal.
 	unsigned output_width, output_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.
@@ -84,25 +87,36 @@ private:
 	Colorspace output_color_space;
 	GammaCurve output_gamma_curve;
 	AlphaType output_alpha_type;
+	bool needs_mipmaps;  // Directly or indirectly.
+
+	// Set if this effect, and all effects consuming output from this node
+	// (in the same phase) have one_to_one_sampling() set.
+	bool one_to_one_sampling;
 
 	friend class EffectChain;
 };
 
 // A rendering phase; a single GLSL program rendering a single quad.
 struct Phase {
+	Node *output_node;
+
 	GLuint glsl_program_num;  // Owned by the resource_pool.
 	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;
-
+	// input textures are counted as part of <effects>.
+	std::vector<Phase *> inputs;
 	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;
+
+	// For measurement of GPU time used.
+	GLuint timer_query_object;
+	uint64_t time_elapsed_ns;
+	uint64_t num_measured_iterations;
 };
 
 class EffectChain {
@@ -160,6 +174,14 @@ public:
 
 	void finalize();
 
+	// Measure the GPU time used for each actual phase during rendering.
+	// Note that this is only available if GL_ARB_timer_query
+	// (or, equivalently, OpenGL 3.3) is available. Also note that measurement
+	// will incur a performance cost, as we wait for the measurements to
+	// complete at the end of rendering.
+	void enable_phase_timing(bool enable);
+	void reset_phase_timing();
+	void print_phase_timing();
 
 	//void render(unsigned char *src, unsigned char *dst);
 	void render_to_screen()
@@ -224,13 +246,20 @@ private:
 	// output gamma different from GAMMA_LINEAR.
 	void find_all_nonlinear_inputs(Node *effect, std::vector<Node *> *nonlinear_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);
+	// Create a GLSL program computing the effects for this phase in order.
+	void compile_glsl_program(Phase *phase);
 
 	// Create all GLSL programs needed to compute the given effect, and all outputs
-	// that depends on it (whenever possible).
-	void construct_glsl_programs(Node *output);
+	// that depend on it (whenever possible). Returns the phase that has <output>
+	// as the last effect. Also pushes all phases in order onto <phases>.
+	Phase *construct_phase(Node *output, std::map<Node *, Phase *> *completed_effects);
+
+	// Execute one phase, ie. set up all inputs, effects and outputs, and render the quad.
+	void execute_phase(Phase *phase, bool last_phase, std::map<Phase *, GLuint> *output_textures, std::set<Phase *> *generated_mipmaps);
+
+	// Set up the given sampler number for sampling from an RTT texture,
+	// and bind it to "tex_" plus the given GLSL variable.
+	void setup_rtt_sampler(GLuint glsl_program_num, int sampler_num, const std::string &effect_id, bool use_mipmaps);
 
 	// Output the current graph to the given file in a Graphviz-compatible format;
 	// only useful for debugging.
@@ -292,6 +321,8 @@ private:
 
 	ResourcePool *resource_pool;
 	bool owns_resource_pool;
+
+	bool do_phase_timing;
 };
 
 }  // namespace movit