X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=8ac98ba64a3b0f1dce1968d39dafe0d0350860e0;hp=dec0f1c2ea2498b2eb9d30af1a319a0de07c7883;hb=dc03e3b0a5b0bbe8c6cdf5da9bc72376f79857b4;hpb=cfc161e0289c2169d4835c48751ff56b97355eb2

diff --git a/flat_input.h b/flat_input.h
index dec0f1c..8ac98ba 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,12 +1,13 @@
 #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"
@@ -38,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:
@@ -56,6 +58,7 @@ 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
@@ -75,6 +78,22 @@ public:
 		invalidate_pixel_data();
 	}
 
+	void set_pixel_data(const unsigned short *pixel_data, GLuint pbo = 0)
+	{
+		assert(this->type == GL_UNSIGNED_SHORT);
+		this->pixel_data = pixel_data;
+		this->pbo = pbo;
+		invalidate_pixel_data();
+	}
+
+	void set_pixel_data_fp16(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);