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

diff --git a/flat_input.h b/flat_input.h
index 8c88989..495a36c 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -26,8 +26,14 @@ 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));
 	}
@@ -121,6 +127,7 @@ private:
 	const void *pixel_data;
 	ResourcePool *resource_pool;
 	bool fixup_swap_rb, fixup_red_to_grayscale;
+	GLint uniform_tex;
 };
 
 }  // namespace movit