Make Movit work in premultiplied alpha.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index cc0280119aaab6c2c7984f91cb8cdf169aad4b99..68e0b93e3dd51e4aca8e07bb99bb5976ee719485 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -25,10 +25,11 @@ void vertical_flip(T *data, unsigned width, unsigned height)
 }  // namespace
 
 EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height,
-                                     MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
+                                     MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve,
+                                     GLenum framebuffer_format)
        : chain(width, height), width(width), height(height), finalized(false)
 {
-       init_movit();
+       init_movit(".", MOVIT_DEBUG_ON);
 
        if (data != NULL) {
                add_input(data, pixel_format, color_space, gamma_curve);
@@ -38,7 +39,7 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
        check_error();
        glBindTexture(GL_TEXTURE_2D, texnum);
        check_error();
-       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
        check_error();
 
        glGenFramebuffers(1, &fbo);