X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=5f3faedc86d29d1baa24ed7f49ae7fbb04a4596e;hp=87a0d5e8ce8f3b0a6134366ddf548395497e96f6;hb=56ff92c5828a143595eeb7a1906418cc30668f9d;hpb=b10c546f579c7ccb5939161e61a71cd18a3f9bbd

diff --git a/flat_input.h b/flat_input.h
index 87a0d5e..5f3faed 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,10 +1,20 @@
-#ifndef _FLAT_INPUT_H
-#define _FLAT_INPUT_H 1
+#ifndef _MOVIT_FLAT_INPUT_H
+#define _MOVIT_FLAT_INPUT_H 1
 
+#include <epoxy/gl.h>
 #include <assert.h>
+#include <string>
 
-#include "input.h"
+#include "effect.h"
+#include "effect_chain.h"
+#include "fp16.h"
+#include "image_format.h"
 #include "init.h"
+#include "input.h"
+
+namespace movit {
+
+class ResourcePool;
 
 // A FlatInput is the normal, “classic” case of an input, where everything
 // comes from a single 2D array with chunky pixels.
@@ -15,11 +25,6 @@ public:
 
 	virtual std::string effect_type_id() const { return "FlatInput"; }
 
-	// Create the texture itself. We cannot do this in the constructor,
-	// because we don't necessarily know all the settings (sRGB texture,
-	// mipmap generation) at that point.
-	void finalize();
-
 	virtual bool can_output_linear_gamma() const {
 		return (movit_srgb_textures_supported &&
 		        type == GL_UNSIGNED_BYTE &&
@@ -30,10 +35,11 @@ public:
 		switch (pixel_format) {
 		case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
 		case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
-			return INPUT_AND_OUTPUT_ALPHA_PREMULTIPLIED;
+			return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
 		case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
 		case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
-			return OUTPUT_ALPHA_POSTMULTIPLIED;
+			return OUTPUT_POSTMULTIPLIED_ALPHA;
+		case FORMAT_RG:
 		case FORMAT_RGB:
 		case FORMAT_BGR:
 		case FORMAT_GRAYSCALE:
@@ -52,44 +58,65 @@ public:
 	unsigned get_height() const { return height; }
 	Colorspace get_color_space() const { return image_format.color_space; }
 	GammaCurve get_gamma_curve() const { return image_format.gamma_curve; }
+	virtual bool is_single_texture() const { return true; }
 
 	// Tells the input where to fetch the actual pixel data. Note that if you change
 	// this data, you must either call set_pixel_data() again (using the same pointer
 	// is fine), or invalidate_pixel_data(). Otherwise, the texture won't be re-uploaded
 	// on subsequent frames.
-	void set_pixel_data(const unsigned char *pixel_data)
+	//
+	// The data can either be a regular pointer (if pbo==0), or a byte offset
+	// into a PBO. The latter will allow you to start uploading the texture data
+	// asynchronously to the GPU, if you have any CPU-intensive work between the
+	// call to set_pixel_data() and the actual rendering. In either case,
+	// the pointer (and PBO, if set) has to be valid at the time of the render call.
+	void set_pixel_data(const unsigned char *pixel_data, GLuint pbo = 0)
 	{
 		assert(this->type == GL_UNSIGNED_BYTE);
 		this->pixel_data = pixel_data;
+		this->pbo = pbo;
 		invalidate_pixel_data();
 	}
 
-	void set_pixel_data(const float *pixel_data)
+	void set_pixel_data(const fp16_int_t *pixel_data, GLuint pbo = 0)
 	{
-		assert(this->type == GL_FLOAT);
+		assert(this->type == GL_HALF_FLOAT);
 		this->pixel_data = pixel_data;
+		this->pbo = pbo;
 		invalidate_pixel_data();
 	}
 
-	void invalidate_pixel_data()
+	void set_pixel_data(const float *pixel_data, GLuint pbo = 0)
 	{
-		needs_update = true;
+		assert(this->type == GL_FLOAT);
+		this->pixel_data = pixel_data;
+		this->pbo = pbo;
+		invalidate_pixel_data();
 	}
 
+	void invalidate_pixel_data();
+
 	void set_pitch(unsigned pitch) {
-		assert(!finalized);
 		this->pitch = pitch;
+		invalidate_pixel_data();
+	}
+
+	virtual void inform_added(EffectChain *chain)
+	{
+		resource_pool = chain->get_resource_pool();
 	}
 
 private:
 	ImageFormat image_format;
 	MovitPixelFormat pixel_format;
-	GLenum format, type;
+	GLenum type;
 	GLuint pbo, texture_num;
-	bool needs_update, finalized;
 	int output_linear_gamma, needs_mipmaps;
-	unsigned width, height, pitch, bytes_per_pixel;
+	unsigned width, height, pitch;
 	const void *pixel_data;
+	ResourcePool *resource_pool;
 };
 
-#endif // !defined(_FLAT_INPUT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_FLAT_INPUT_H)