Give NULL to glTexImage2D() instead of zeroing memory ourselves.

[movit] / effect_chain.cpp

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 19c485c32aea33acb2d6fc8fd57cf848288380f5..270eae6c4ce9bd7933c46f3f3ffae1ce4e4ac27b 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -64,7 +64,7 @@ void EffectChain::normalize_to_linear_gamma()
        } else {
                GammaExpansionEffect *gamma_conversion = new GammaExpansionEffect();
                gamma_conversion->set_int("source_curve", current_gamma_curve);
-               effects.push_back(gamma_conversion);
+               gamma_conversion->add_self_to_effect_chain(&effects);
        }
        current_gamma_curve = GAMMA_LINEAR;
 }
@@ -75,7 +75,7 @@ void EffectChain::normalize_to_srgb()
        ColorSpaceConversionEffect *colorspace_conversion = new ColorSpaceConversionEffect();
        colorspace_conversion->set_int("source_space", current_color_space);
        colorspace_conversion->set_int("destination_space", COLORSPACE_sRGB);
-       effects.push_back(colorspace_conversion);
+       colorspace_conversion->add_self_to_effect_chain(&effects);
        current_color_space = COLORSPACE_sRGB;
 }
 
@@ -91,7 +91,7 @@ Effect *EffectChain::add_effect(EffectId effect_id)
                normalize_to_srgb();
        }
 
-       effects.push_back(effect);
+       effect->add_self_to_effect_chain(&effects);
        return effect;
 }
 
@@ -220,7 +220,6 @@ void EffectChain::finalize()
                unsigned num_textures = std::max<int>(phases.size() - 1, 2);
                glGenTextures(num_textures, temp_textures);
 
-               unsigned char *empty = new unsigned char[width * height * 4];
                for (unsigned i = 0; i < num_textures; ++i) {
                        glBindTexture(GL_TEXTURE_2D, temp_textures[i]);
                        check_error();
@@ -228,10 +227,9 @@ void EffectChain::finalize()
                        check_error();
                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
                        check_error();
-                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, empty);
+                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
                        check_error();
                }
-               delete[] empty;
        }
        
        // Translate the input format to OpenGL's enums.
@@ -266,6 +264,7 @@ void EffectChain::finalize()
        void *mapped_pbo = glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY);
        memset(mapped_pbo, 0, width * height * bytes_per_pixel);
        glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB);
+       check_error();
        
        glGenTextures(1, &source_image_num);
        check_error();
@@ -329,6 +328,7 @@ void EffectChain::render_to_screen(unsigned char *src)
 
        for (unsigned phase = 0; phase < phases.size(); ++phase) {
                // Set up inputs and outputs for this phase.
+               glActiveTexture(GL_TEXTURE0);
                if (phase == 0) {
                        // First phase reads from the input texture (which is already bound).
                } else {
@@ -356,6 +356,7 @@ void EffectChain::render_to_screen(unsigned char *src)
                                GL_TEXTURE_2D,
                                temp_textures[phase % 2],
                                0);
+                       check_error();
                }
 
                // We have baked an upside-down transform into the quad coordinates,