Fix an issue where the last pass would have been rendered with the sRGB flag set...

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 10573ef8aba7ac58cf4c037db15552321e494cad..7b0861f903e9beaf695057e795b165577f35041e 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -1733,8 +1733,10 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
        check_error();
        glDisable(GL_DITHER);
        check_error();
-       glEnable(GL_FRAMEBUFFER_SRGB);
+
+       const bool final_srgb = glIsEnabled(GL_FRAMEBUFFER_SRGB);
        check_error();
+       bool current_srgb = final_srgb;
 
        // Save original viewport.
        GLuint x = 0, y = 0;
@@ -1800,7 +1802,22 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
                                CHECK(dither_effect->set_int("output_height", height));
                        }
                }
-               execute_phase(phase, phase_num == phases.size() - 1, &bound_attribute_indices, &output_textures, &generated_mipmaps);
+               bool last_phase = (phase_num == phases.size() - 1);
+
+               // Enable sRGB rendering for intermediates in case we are
+               // rendering to an sRGB format.
+               bool needs_srgb = last_phase ? final_srgb : true;
+               if (needs_srgb && !current_srgb) {
+                       glEnable(GL_FRAMEBUFFER_SRGB);
+                       check_error();
+                       current_srgb = true;
+               } else if (!needs_srgb && current_srgb) {
+                       glDisable(GL_FRAMEBUFFER_SRGB);
+                       check_error();
+                       current_srgb = true;
+               }
+
+               execute_phase(phase, last_phase, &bound_attribute_indices, &output_textures, &generated_mipmaps);
                if (do_phase_timing) {
                        glEndQuery(GL_TIME_ELAPSED);
                }

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index cb30d4d2e8a736c009c1381d5953fd41da4eb6e0..bbb58a0587409d6cca03d867e110b34dee6c6a3c 100644 (file)
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -1319,6 +1319,9 @@ TEST(EffectChainTest, sRGBIntermediate) {
            << "Expected sRGB not to be able to represent 0.5 exactly (got " << out_data[1] << ")";
        EXPECT_LT(fabs(out_data[1] - data[1]), 0.1f)
            << "Expected sRGB to be able to represent 0.5 approximately (got " << out_data[1] << ")";
+
+       // This state should have been preserved.
+       EXPECT_FALSE(glIsEnabled(GL_FRAMEBUFFER_SRGB));
 }
 
 // An effect that is like IdentityEffect, but also does not require linear light.