X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=1be98916d9ccd6952580aef165488c55cecc7588;hp=d1ab0a205148bd9d8a22e285a448d758a5fd7e00;hb=ddbe6136a25fddc14c7b70c9d76857313b8f9957;hpb=80fc4a6e806e5638ae050c3020962137ca5fd76b

diff --git a/effect_chain.h b/effect_chain.h
index d1ab0a2..1be9891 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -27,7 +27,9 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <Eigen/Core>
 
+#include "effect.h"
 #include "image_format.h"
 #include "ycbcr.h"
 
@@ -107,6 +109,10 @@ struct Phase {
 	// Inputs are only inputs from other phases (ie., those that come from RTT);
 	// input textures are counted as part of <effects>.
 	std::vector<Phase *> inputs;
+	// Bound sampler numbers for each input. Redundant in a sense
+	// (it always corresponds to the index), but we need somewhere
+	// to hold the value for the uniform.
+	std::vector<int> input_samplers;
 	std::vector<Node *> effects;  // In order.
 	unsigned output_width, output_height, virtual_output_width, virtual_output_height;
 
@@ -114,6 +120,16 @@ struct Phase {
 	// Unique per-phase to increase cacheability of compiled shaders.
 	std::map<Node *, std::string> effect_ids;
 
+	// Uniforms for this phase; combined from all the effects.
+	std::vector<Uniform<int> > uniforms_sampler2d;
+	std::vector<Uniform<bool> > uniforms_bool;
+	std::vector<Uniform<int> > uniforms_int;
+	std::vector<Uniform<float> > uniforms_float;
+	std::vector<Uniform<float> > uniforms_vec2;
+	std::vector<Uniform<float> > uniforms_vec3;
+	std::vector<Uniform<float> > uniforms_vec4;
+	std::vector<Uniform<Eigen::Matrix3d> > uniforms_mat3;
+
 	// For measurement of GPU time used.
 	GLuint timer_query_object;
 	uint64_t time_elapsed_ns;
@@ -265,9 +281,11 @@ private:
 	// 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);
+	// Set up uniforms for one phase. The program must already be bound.
+	void setup_uniforms(Phase *phase);
+
+	// Set up the given sampler number for sampling from an RTT texture.
+	void setup_rtt_sampler(int sampler_num, bool use_mipmaps);
 
 	// Output the current graph to the given file in a Graphviz-compatible format;
 	// only useful for debugging.