X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;fp=flat_input.h;h=b337788f4edaa328c1c5f1a00f2b6b4787ff6245;hp=d8b62b7ec369b4ecf4272bd90cbf89fa4933bf08;hb=4f45f136fd2f652e923463189c5b8f74464a7268;hpb=d47ac1e362683896033f43ecd9aeb2f2330b5678 diff --git a/flat_input.h b/flat_input.h index d8b62b7..b337788 100644 --- a/flat_input.h +++ b/flat_input.h @@ -9,7 +9,6 @@ #include "effect_chain.h" #include "fp16.h" #include "image_format.h" -#include "init.h" #include "input.h" namespace movit { @@ -30,8 +29,7 @@ public: // 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 && + return (type == GL_UNSIGNED_BYTE && (pixel_format == FORMAT_RGB || pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) && (image_format.gamma_curve == GAMMA_LINEAR ||