Keep FBOs around in EffectChain again.

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index c5e10e84a39c2315773315c8ae871e05342e012c..8d3c61d27f4293eed70e9b5dfd4b02e6af9e9bbf 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -59,6 +59,11 @@ EffectChain::~EffectChain()
        if (owns_resource_pool) {
                delete resource_pool;
        }
        if (owns_resource_pool) {
                delete resource_pool;
        }

+       for (map<void *, GLuint>::const_iterator fbo_it = fbos.begin();
+            fbo_it != fbos.end(); ++fbo_it) {
+               glDeleteFramebuffers(1, &fbo_it->second);
+               check_error();
+       }

 }
 
 Input *EffectChain::add_input(Input *input)
 }
 
 Input *EffectChain::add_input(Input *input)


@@ -1405,6 +1410,7 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
        // Save original viewport.
        GLuint x = 0, y = 0;
        GLuint fbo = 0;
        // Save original viewport.
        GLuint x = 0, y = 0;
        GLuint fbo = 0;

+       void *context = get_gl_context_identifier();

 
        if (width == 0 && height == 0) {
                GLint viewport[4];
 
        if (width == 0 && height == 0) {
                GLint viewport[4];


@@ -1424,8 +1430,13 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
        check_error();
 
        if (phases.size() > 1) {
        check_error();
 
        if (phases.size() > 1) {

-               glGenFramebuffers(1, &fbo);
-               check_error();
+               if (fbos.count(context) == 0) {
+                       glGenFramebuffers(1, &fbo);
+                       check_error();
+                       fbos.insert(make_pair(context, fbo));
+               } else {
+                       fbo = fbos[context];
+               }

                glBindFramebuffer(GL_FRAMEBUFFER, fbo);
                check_error();
        }
                glBindFramebuffer(GL_FRAMEBUFFER, fbo);
                check_error();
        }


@@ -1564,11 +1575,6 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
 
        glBindFramebuffer(GL_FRAMEBUFFER, 0);
        check_error();
 
        glBindFramebuffer(GL_FRAMEBUFFER, 0);
        check_error();

-
-       if (fbo != 0) {
-               glDeleteFramebuffers(1, &fbo);
-               check_error();
-       }

 }
 
 }  // namespace movit
 }
 
 }  // namespace movit