X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=d8b62b7ec369b4ecf4272bd90cbf89fa4933bf08;hp=25b9091abc837baa699d5d36bc2c0b94253dc97a;hb=54d47f65e9abac77229636fbaaefea8caf34a4d4;hpb=d4109eee4f38a13a7f8432755bc8b6bf02ceda46

diff --git a/flat_input.h b/flat_input.h
index 25b9091..d8b62b7 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -107,26 +107,63 @@ public:
 
 	void invalidate_pixel_data();
 
+	// Note: Sets pitch to width, so even if your pitch is unchanged,
+	// you will need to re-set it after this call.
+	void set_width(unsigned width)
+	{
+		this->pitch = this->width = width;
+		invalidate_pixel_data();
+	}
+
+	void set_height(unsigned height)
+	{
+		this->height = height;
+		invalidate_pixel_data();
+	}
+
 	void set_pitch(unsigned pitch) {
 		this->pitch = pitch;
 		invalidate_pixel_data();
 	}
 
+	// Tells the input to use the specific OpenGL texture as pixel data.
+	// This is useful if you want to share the same texture between multiple
+	// EffectChain instances, or if you somehow can get the data into a texture more
+	// efficiently than through a normal upload (e.g. a video codec decoding straight
+	// into a texture). Note that you are responsible for setting the right sampler
+	// parameters (e.g. clamp-to-edge) yourself, as well as generate any mipmaps
+	// if they are needed.
+	//
+	// NOTE: The input does not take ownership of this texture; you are responsible
+	// for releasing it yourself. In particular, if you call invalidate_pixel_data()
+	// or anything calling it, the texture will silently be removed from the input.
+	void set_texture_num(GLuint texture_num)
+	{
+		possibly_release_texture();
+		this->texture_num = texture_num;
+		this->owns_texture = false;
+	}
+
 	virtual void inform_added(EffectChain *chain)
 	{
 		resource_pool = chain->get_resource_pool();
 	}
 
 private:
+	// Release the texture if we have any, and it is owned by us.
+	void possibly_release_texture();
+
 	ImageFormat image_format;
 	MovitPixelFormat pixel_format;
 	GLenum type;
 	GLuint pbo, texture_num;
 	int output_linear_gamma, needs_mipmaps;
 	unsigned width, height, pitch;
+	bool owns_texture;
 	const void *pixel_data;
 	ResourcePool *resource_pool;
 	bool fixup_swap_rb, fixup_red_to_grayscale;
+	GLint uniform_tex;
 };
 
 }  // namespace movit