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

diff --git a/flat_input.h b/flat_input.h
index caa68b7..8c88989 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -34,15 +34,12 @@ public:
 	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_R:
 		case FORMAT_RG:
 		case FORMAT_RGB:
-		case FORMAT_BGR:
-		case FORMAT_GRAYSCALE:
 			return OUTPUT_BLANK_ALPHA;
 		default:
 			assert(false);
@@ -58,6 +55,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
@@ -77,7 +75,15 @@ public:
 		invalidate_pixel_data();
 	}
 
-	void set_pixel_data(const fp16_int_t *pixel_data, GLuint pbo = 0)
+	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;
@@ -114,6 +120,7 @@ private:
 	unsigned width, height, pitch;
 	const void *pixel_data;
 	ResourcePool *resource_pool;
+	bool fixup_swap_rb, fixup_red_to_grayscale;
 };
 
 }  // namespace movit