X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=495a36cbdc10f5be9f0d22484dc018cbbb236316;hp=8ac98ba64a3b0f1dce1968d39dafe0d0350860e0;hb=6f1efa8348a90a393187c12d70fd10d81bbd2c99;hpb=c5b9c3df43caa7a88f2f729a5c52359ca8ca537f

diff --git a/flat_input.h b/flat_input.h
index 8ac98ba..495a36c 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);
@@ -123,6 +126,8 @@ private:
 	unsigned width, height, pitch;
 	const void *pixel_data;
 	ResourcePool *resource_pool;
+	bool fixup_swap_rb, fixup_red_to_grayscale;
+	GLint uniform_tex;
 };
 
 }  // namespace movit