]> git.sesse.net Git - movit/commitdiff
Unbreak multi-phase rendering after we added the render-to-FBO functionality.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 13 Oct 2012 13:33:43 +0000 (15:33 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 13 Oct 2012 13:33:43 +0000 (15:33 +0200)
effect_chain.cpp

index a6ed91d5f20a51e406fafc0e79894e0b3f5f2cb0..617d1cb007f392bf6fe816c9ccbd1ead68c9722b 100644 (file)
@@ -973,7 +973,7 @@ void EffectChain::finalize()
        finalized = true;
 }
 
        finalized = true;
 }
 
-void EffectChain::render_to_fbo(GLuint fbo, unsigned width, unsigned height)
+void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height)
 {
        assert(finalized);
 
 {
        assert(finalized);
 
@@ -1066,7 +1066,7 @@ void EffectChain::render_to_fbo(GLuint fbo, unsigned width, unsigned height)
                // And now the output.
                if (phase == phases.size() - 1) {
                        // Last phase goes to the output the user specified.
                // And now the output.
                if (phase == phases.size() - 1) {
                        // Last phase goes to the output the user specified.
-                       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+                       glBindFramebuffer(GL_FRAMEBUFFER, dest_fbo);
                        check_error();
                        glViewport(x, y, width, height);
                } else {
                        check_error();
                        glViewport(x, y, width, height);
                } else {