Fix compiling without C++11.

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index b0a14777287733fe5c1210ca0d0e6b38e77cfa32..10573ef8aba7ac58cf4c037db15552321e494cad 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -38,6 +38,7 @@ EffectChain::EffectChain(float aspect_nom, float aspect_denom, ResourcePool *res
          output_color_rgba(false),
          output_color_ycbcr(false),
          dither_effect(NULL),
+         ycbcr_conversion_effect_node(NULL),
          intermediate_format(GL_RGBA16F),
          intermediate_transformation(NO_FRAMEBUFFER_TRANSFORMATION),
          num_dither_bits(0),
@@ -110,6 +111,23 @@ void EffectChain::add_ycbcr_output(const ImageFormat &format, OutputAlphaFormat
        assert(ycbcr_format.chroma_subsampling_y == 1);
 }
 
+void EffectChain::change_ycbcr_output_format(const YCbCrFormat &ycbcr_format)
+{
+       assert(output_color_ycbcr);
+       assert(output_ycbcr_format.chroma_subsampling_x == ycbcr_format.chroma_subsampling_x);
+       assert(output_ycbcr_format.chroma_subsampling_y == ycbcr_format.chroma_subsampling_y);
+       assert(fabs(output_ycbcr_format.cb_x_position - ycbcr_format.cb_x_position) < 1e-3);
+       assert(fabs(output_ycbcr_format.cb_y_position - ycbcr_format.cb_y_position) < 1e-3);
+       assert(fabs(output_ycbcr_format.cr_x_position - ycbcr_format.cr_x_position) < 1e-3);
+       assert(fabs(output_ycbcr_format.cr_y_position - ycbcr_format.cr_y_position) < 1e-3);
+
+       output_ycbcr_format = ycbcr_format;
+       if (finalized) {
+               YCbCrConversionEffect *effect = (YCbCrConversionEffect *)(ycbcr_conversion_effect_node->effect);
+               effect->change_output_format(ycbcr_format);
+       }
+}
+
 Node *EffectChain::add_node(Effect *effect)
 {
        for (unsigned i = 0; i < nodes.size(); ++i) {
@@ -1194,11 +1212,10 @@ void EffectChain::propagate_alpha()
                if (alpha_handling == Effect::INPUT_AND_OUTPUT_PREMULTIPLIED_ALPHA ||
                    alpha_handling == Effect::INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK) {
                        // This combination (requiring premultiplied alpha, but _not_ requiring
-                       // linear light) is illegal, // since the combination
-                       // of premultiplied alpha and nonlinear inputs is
-                       // meaningless.
+                       // linear light) is illegal, since the combination of premultiplied alpha
+                       // and nonlinear inputs is meaningless.
                        assert(node->effect->needs_linear_light());
-                       
+
                        // If the effect has asked for premultiplied alpha, check that it has got it.
                        if (any_postmultiplied) {
                                node->output_alpha_type = ALPHA_INVALID;
@@ -1600,8 +1617,8 @@ void EffectChain::add_ycbcr_conversion_if_needed()
                return;
        }
        Node *output = find_output_node();
-       Node *ycbcr = add_node(new YCbCrConversionEffect(output_ycbcr_format));
-       connect_nodes(output, ycbcr);
+       ycbcr_conversion_effect_node = add_node(new YCbCrConversionEffect(output_ycbcr_format));
+       connect_nodes(output, ycbcr_conversion_effect_node);
 }
        
 // If the user has requested dither, add a DitherEffect right at the end
@@ -1883,9 +1900,6 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase,
                output_textures->insert(make_pair(phase, tex_num));
        }
 
-       glUseProgram(phase->glsl_program_num);
-       check_error();
-
        // Set up RTT inputs for this phase.
        for (unsigned sampler = 0; sampler < phase->inputs.size(); ++sampler) {
                glActiveTexture(GL_TEXTURE0 + sampler);
@@ -1909,12 +1923,15 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase,
                glViewport(0, 0, phase->output_width, phase->output_height);
        }
 
+       GLuint instance_program_num = resource_pool->use_glsl_program(phase->glsl_program_num);
+       check_error();
+
        // Give the required parameters to all the effects.
        unsigned sampler_num = phase->inputs.size();
        for (unsigned i = 0; i < phase->effects.size(); ++i) {
                Node *node = phase->effects[i];
                unsigned old_sampler_num = sampler_num;
-               node->effect->set_gl_state(phase->glsl_program_num, phase->effect_ids[node], &sampler_num);
+               node->effect->set_gl_state(instance_program_num, phase->effect_ids[node], &sampler_num);
                check_error();
 
                if (node->effect->is_single_texture()) {
@@ -1962,6 +1979,8 @@ void EffectChain::execute_phase(Phase *phase, bool last_phase,
                node->effect->clear_gl_state();
        }
 
+       resource_pool->unuse_glsl_program(instance_program_num);
+
        if (!last_phase) {
                resource_pool->release_fbo(fbo);
        }