X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=flat_input.h;h=caa68b77900fcbff7e2db2ab7999e66f40d0d942;hb=8c7e53028a3ef4805d2608643041a5d7e6bd1b6e;hp=7875e2c793ce91778b2ae5598bc63da1112434fb;hpb=358df88f77e4f8ae2ead71a06dc36bf5402d9b5d;p=movit

diff --git a/flat_input.h b/flat_input.h
index 7875e2c..caa68b7 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,16 +1,19 @@
 #ifndef _MOVIT_FLAT_INPUT_H
 #define _MOVIT_FLAT_INPUT_H 1
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <string>
 
 #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
@@ -22,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 &&
@@ -41,6 +39,7 @@ public:
 		case FORMAT_RGBA_POSTMULTIPLIED_ALPHA:
 		case FORMAT_BGRA_POSTMULTIPLIED_ALPHA:
 			return OUTPUT_POSTMULTIPLIED_ALPHA;
+		case FORMAT_RG:
 		case FORMAT_RGB:
 		case FORMAT_BGR:
 		case FORMAT_GRAYSCALE:
@@ -78,6 +77,14 @@ public:
 		invalidate_pixel_data();
 	}
 
+	void set_pixel_data(const fp16_int_t *pixel_data, GLuint pbo = 0)
+	{
+		assert(this->type == GL_HALF_FLOAT);
+		this->pixel_data = pixel_data;
+		this->pbo = pbo;
+		invalidate_pixel_data();
+	}
+
 	void set_pixel_data(const float *pixel_data, GLuint pbo = 0)
 	{
 		assert(this->type == GL_FLOAT);
@@ -89,8 +96,8 @@ public:
 	void invalidate_pixel_data();
 
 	void set_pitch(unsigned pitch) {
-		assert(!finalized);
 		this->pitch = pitch;
+		invalidate_pixel_data();
 	}
 
 	virtual void inform_added(EffectChain *chain)
@@ -101,13 +108,14 @@ public:
 private:
 	ImageFormat image_format;
 	MovitPixelFormat pixel_format;
-	GLenum internal_format, format, type;
+	GLenum type;
 	GLuint pbo, texture_num;
-	bool finalized;
 	int output_linear_gamma, needs_mipmaps;
 	unsigned width, height, pitch;
 	const void *pixel_data;
 	ResourcePool *resource_pool;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_FLAT_INPUT_H)