X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=flat_input.h;h=caa68b77900fcbff7e2db2ab7999e66f40d0d942;hb=8c7e53028a3ef4805d2608643041a5d7e6bd1b6e;hp=57f6f5a27d75213f92e668065dbd23991ef91781;hpb=f8e636666b3d36f97b125bc1a0f0f582c5026c7f;p=movit

diff --git a/flat_input.h b/flat_input.h
index 57f6f5a..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
@@ -36,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:
@@ -73,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);
@@ -104,4 +116,6 @@ private:
 	ResourcePool *resource_pool;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_FLAT_INPUT_H)