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

diff --git a/effect_chain.h b/effect_chain.h
index 2f088b6..1be9891 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -27,8 +27,11 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <Eigen/Core>
 
+#include "effect.h"
 #include "image_format.h"
+#include "ycbcr.h"
 
 namespace movit {
 
@@ -106,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;
 
@@ -113,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;
@@ -162,8 +179,15 @@ public:
 	}
 	Effect *add_effect(Effect *effect, const std::vector<Effect *> &inputs);
 
+	// Adds an RGB output. Note that you can only have one output.
 	void add_output(const ImageFormat &format, OutputAlphaFormat alpha_format);
 
+	// Adds an YCbCr output. Note that you can only have one output.
+	// Currently, only chunked packed output is supported, and only 4:4:4
+	// (so chroma_subsampling_x and chroma_subsampling_y must both be 1).
+	void add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat alpha_format,
+	                      const YCbCrFormat &ycbcr_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.
@@ -257,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.
@@ -303,12 +329,17 @@ 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_ycbcr_conversion_if_needed();
 	void add_dither_if_needed();
 
 	float aspect_nom, aspect_denom;
 	ImageFormat output_format;
 	OutputAlphaFormat output_alpha_format;
 
+	enum OutputColorType { OUTPUT_COLOR_RGB, OUTPUT_COLOR_YCBCR };
+	OutputColorType output_color_type;
+	YCbCrFormat output_ycbcr_format;  // If output_color_type == OUTPUT_COLOR_YCBCR.
+
 	std::vector<Node *> nodes;
 	std::map<Effect *, Node *> node_map;
 	Effect *dither_effect;