X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=c11d0a0123fcdb8bb4bd8bb4e60c26beed09692d;hp=cf6b0b9264d878b0e90378c00d61cb5369fec741;hb=4f0f3a800365a9f928387ad108ac904af0a966e6;hpb=1ca4785183b5af9a2a255bba0a28dfdae156470a

diff --git a/flat_input.h b/flat_input.h
index cf6b0b9..c11d0a0 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,8 +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 "effect.h"
+#include "effect_chain.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.
 class FlatInput : public Input {
@@ -12,17 +24,28 @@ 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();
-
-	// TODO: Check that we actually have the required extension.
 	virtual bool can_output_linear_gamma() const {
-		return (type == GL_UNSIGNED_BYTE &&
+		return (movit_srgb_textures_supported &&
+		        type == GL_UNSIGNED_BYTE &&
 		        (image_format.gamma_curve == GAMMA_LINEAR ||
 		         image_format.gamma_curve == GAMMA_sRGB));
 	}
+	virtual AlphaHandling alpha_handling() const {
+		switch (pixel_format) {
+		case FORMAT_RGBA_PREMULTIPLIED_ALPHA:
+		case FORMAT_BGRA_PREMULTIPLIED_ALPHA:
+			return INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA;
+		case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
+		case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
+			return OUTPUT_POSTMULTIPLIED_ALPHA;
+		case FORMAT_RGB:
+		case FORMAT_BGR:
+		case FORMAT_GRAYSCALE:
+			return OUTPUT_BLANK_ALPHA;
+		default:
+			assert(false);
+		}
+	}
 
 	std::string output_fragment_shader();
 
@@ -38,39 +61,51 @@ public:
 	// 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 float *pixel_data, GLuint pbo = 0)
 	{
 		assert(this->type == GL_FLOAT);
 		this->pixel_data = pixel_data;
+		this->pbo = pbo;
 		invalidate_pixel_data();
 	}
 
-	void invalidate_pixel_data()
-	{
-		needs_update = true;
-	}
+	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)