Always require GL_EXT_texture_sRGB_decode.

[nageru] / nageru / theme.cpp

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index aa2d59a1e09032c49771a5b24e6b2ce4d9efc109..33fa114538d046cf5049c1cbf4b8fdba1d9b909b 100644 (file)
--- 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());
                }
 
@@ -1285,7 +1281,7 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
                if (lua_pcall(L, 0, 0, 0) != 0) {
                        fprintf(stderr, "error running chain setup callback: %s\n", lua_tostring(L, -1));
                        abort();
-       }
+               }
                assert(lua_gettop(L) == 0);
 
                // The theme can't (or at least shouldn't!) call connect_signal() on
@@ -1428,7 +1424,7 @@ vector<string> Theme::get_transition_names(float t)
        lua_pop(L, 1);
        assert(lua_gettop(L) == 0);
        return ret;
-}      
+}
 
 int Theme::map_signal(int signal_num)
 {