X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=25b9091abc837baa699d5d36bc2c0b94253dc97a;hp=5f3faedc86d29d1baa24ed7f49ae7fbb04a4596e;hb=95edbfccb0843da3cc105dadc5bc6d8e102f6071;hpb=1320ed72d619610b9f056c106496dfe7dbd95e06

diff --git a/flat_input.h b/flat_input.h
index 5f3faed..25b9091 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -26,23 +26,26 @@ public:
 	virtual std::string effect_type_id() const { return "FlatInput"; }
 
 	virtual bool can_output_linear_gamma() const {
+		// On desktop OpenGL, there's also GL_SLUMINANCE8 which could give us
+		// support for single-channel sRGB decoding, but it's not supported
+		// on GLES, and we're already actively rewriting single-channel inputs
+		// to GL_RED (even on desktop), so we stick to 3- and 4-channel inputs.
 		return (movit_srgb_textures_supported &&
 		        type == GL_UNSIGNED_BYTE &&
+			(pixel_format == FORMAT_RGB ||
+			 pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) &&
 		        (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_R:
 		case FORMAT_RG:
 		case FORMAT_RGB:
-		case FORMAT_BGR:
-		case FORMAT_GRAYSCALE:
 			return OUTPUT_BLANK_ALPHA;
 		default:
 			assert(false);
@@ -78,7 +81,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;
@@ -115,6 +126,7 @@ private:
 	unsigned width, height, pitch;
 	const void *pixel_data;
 	ResourcePool *resource_pool;
+	bool fixup_swap_rb, fixup_red_to_grayscale;
 };
 
 }  // namespace movit