Generate the FBO anew every render.

This fixes an issue where reusing the same EffectChain from two different GL
contexts would cause errors even if they are shared, because FBOs cannot be
shared between contexts (in the ARB extension, anyway).

There might be some negative performance implications to this, but I was unable
to measure any on Intel/Mesa. If this should prove to be a problem in the future,
we could maybe keep one around per context, or have the caller invalidate the
FBO for us.

diff --git a/effect_chain.cpp b/effect_chain.cpp
index e68895d7b8f40c8c30475b8f51e0e49c7f39a473..f88a4f74986fce003ca4cf0b745c3becdbc018c0 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -29,7 +29,6 @@ EffectChain::EffectChain(float aspect_nom, float aspect_denom)
        : aspect_nom(aspect_nom),
          aspect_denom(aspect_denom),
          dither_effect(NULL),
        : aspect_nom(aspect_nom),
          aspect_denom(aspect_denom),
          dither_effect(NULL),

-         fbo(0),

          num_dither_bits(0),
          finalized(false) {}
 
          num_dither_bits(0),
          finalized(false) {}
 


@@ -48,9 +47,6 @@ EffectChain::~EffectChain()
                glDeleteShader(phases[i]->fragment_shader);
                delete phases[i];
        }
                glDeleteShader(phases[i]->fragment_shader);
                delete phases[i];
        }

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

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


@@ -1433,8 +1429,6 @@ void EffectChain::finalize()
        // since otherwise this turns into an (albeit simple)
        // register allocation problem.
        if (phases.size() > 1) {
        // since otherwise this turns into an (albeit simple)
        // register allocation problem.
        if (phases.size() > 1) {

-               glGenFramebuffers(1, &fbo);
-

                for (unsigned i = 0; i < phases.size() - 1; ++i) {
                        inform_input_sizes(phases[i]);
                        find_output_size(phases[i]);
                for (unsigned i = 0; i < phases.size() - 1; ++i) {
                        inform_input_sizes(phases[i]);
                        find_output_size(phases[i]);


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

+       GLuint fbo = 0;

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


@@ -1499,6 +1494,8 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
        glLoadIdentity();
 
        if (phases.size() > 1) {
        glLoadIdentity();
 
        if (phases.size() > 1) {

+               glGenFramebuffers(1, &fbo);
+               check_error();

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


@@ -1614,4 +1611,12 @@ void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height
                        node->effect->clear_gl_state();
                }
        }
                        node->effect->clear_gl_state();
                }
        }

+
+       glBindFramebuffer(GL_FRAMEBUFFER, 0);
+       check_error();
+
+       if (fbo != 0) {
+               glDeleteFramebuffers(1, &fbo);
+               check_error();
+       }

 }
 }

diff --git a/effect_chain.h b/effect_chain.h
index f41e7e4a5e72966a9dd0a56255aca32cf6a3449b..6698c6f70e6b7cf5ee0752fce39840613295810f 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -229,8 +229,6 @@ private:
        Effect *dither_effect;
 
        std::vector<Input *> inputs;  // Also contained in nodes.
        Effect *dither_effect;
 
        std::vector<Input *> inputs;  // Also contained in nodes.

-
-       GLuint fbo;

        std::vector<Phase *> phases;
 
        unsigned num_dither_bits;
        std::vector<Phase *> phases;
 
        unsigned num_dither_bits;