From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 13 Oct 2012 13:33:43 +0000 (+0200)
Subject: Unbreak multi-phase rendering after we added the render-to-FBO functionality.
X-Git-Tag: 1.0~270
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=45c3b698b97bfcf4036910ee3539bd5eab4e9751;ds=sidebyside

Unbreak multi-phase rendering after we added the render-to-FBO functionality.
---

diff --git a/effect_chain.cpp b/effect_chain.cpp
index a6ed91d..617d1cb 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -973,7 +973,7 @@ void EffectChain::finalize()
 	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);
 
@@ -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.
-			glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+			glBindFramebuffer(GL_FRAMEBUFFER, dest_fbo);
 			check_error();
 			glViewport(x, y, width, height);
 		} else {