X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.cpp;h=33fa114538d046cf5049c1cbf4b8fdba1d9b909b;hb=575a3feeaa7420f65a4468b997167d7555794c08;hp=50bf77c0a641c7e745296e3f2c688a5327e54d83;hpb=9d7eede21127eef9a31ea2bd1f786bbf062bf4f4;p=nageru diff --git a/nageru/theme.cpp b/nageru/theme.cpp index 50bf77c..33fa114 100644 --- a/nageru/theme.cpp +++ b/nageru/theme.cpp @@ -905,11 +905,7 @@ LiveInputWrapper::LiveInputWrapper( for (unsigned i = 0; i < num_inputs; ++i) { // We upload our textures ourselves, and Movit swaps // R and B in the shader if we specify BGRA, so lie and say RGBA. - if (global_flags.can_disable_srgb_decoder) { - rgba_inputs.push_back(new sRGBSwitchingFlatInput(inout_format, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, global_flags.width, global_flags.height)); - } else { - rgba_inputs.push_back(new NonsRGBCapableFlatInput(inout_format, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, global_flags.width, global_flags.height)); - } + rgba_inputs.push_back(new sRGBSwitchingFlatInput(inout_format, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, GL_UNSIGNED_BYTE, global_flags.width, global_flags.height)); chain->add_input(rgba_inputs.back()); } @@ -1428,7 +1424,7 @@ vector Theme::get_transition_names(float t) lua_pop(L, 1); assert(lua_gettop(L) == 0); return ret; -} +} int Theme::map_signal(int signal_num) {