Make handling of non-RGBA sRGB textures more consistent.

[movit] / flat_input.h

diff --git a/flat_input.h b/flat_input.h
index 8c8898977ece647120bbb16e03fc4d5e6cb09866..25b9091abc837baa699d5d36bc2c0b94253dc97a 100644 (file)
--- 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));
        }