X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.h;h=a36840d314876e88185ef1f69bf32b537c465f24;hp=8d75e8a7bd1b6dbad1363608529271c4fd7ae471;hb=037ee905bc05fcbb278ac3a0b1f73249efada9b2;hpb=3b9957afac0555a126d1941d7027fb52e29b309a

diff --git a/effect_chain.h b/effect_chain.h
index 8d75e8a..a36840d 100644
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -153,6 +153,9 @@ private:
 	// (in the same phase) have one_to_one_sampling() set.
 	bool one_to_one_sampling;
 
+	// Same, for strong_one_to_one_sampling().
+	bool strong_one_to_one_sampling;
+
 	friend class EffectChain;
 };
 
@@ -181,6 +184,7 @@ struct Phase {
 	// Whether this phase is compiled as a compute shader, ie., the last effect is
 	// marked as one.
 	bool is_compute_shader;
+	Node *compute_shader_node;
 
 	// If <is_compute_shader>, which image unit the output buffer is bound to.
 	// This is used as source for a Uniform<int> below.
@@ -188,6 +192,7 @@ struct Phase {
 
 	// These are used in transforming from unnormalized to normalized coordinates
 	// in compute shaders.
+	int uniform_output_size[2];
 	Point2D inv_output_size, output_texcoord_adjust;
 
 	// Identifier used to create unique variables in GLSL.
@@ -199,6 +204,7 @@ struct Phase {
 	std::vector<Uniform<int>> uniforms_sampler2d;
 	std::vector<Uniform<bool>> uniforms_bool;
 	std::vector<Uniform<int>> uniforms_int;
+	std::vector<Uniform<int>> uniforms_ivec2;
 	std::vector<Uniform<float>> uniforms_float;
 	std::vector<Uniform<float>> uniforms_vec2;
 	std::vector<Uniform<float>> uniforms_vec3;
@@ -397,7 +403,12 @@ public:
 	// Only one destination texture is supported. This restriction will be lifted
 	// in the future.
 	//
-	// All destination textures must be exactly of size <width> x <height>.
+	// All destination textures must be exactly of size <width> x <height>,
+	// and must either come from the same ResourcePool the effect uses, or outlive
+	// the EffectChain (otherwise, we could be allocating FBOs that end up being
+	// stale). Textures must also have valid state; in particular, they must either
+	// be mipmap complete or have a non-mipmapped minification mode.
+	//
 	// width and height can not be zero.
 	struct DestinationTexture {
 		GLuint texnum;