Allow the EffectChainTester framebuffer to be in something else than float. This...

diff --git a/test_util.cpp b/test_util.cpp
index cc0280119aaab6c2c7984f91cb8cdf169aad4b99..9053c5e6d6e9f003d34c45299bc8cf494e8990f5 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -25,7 +25,8 @@ 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();
@@ -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);

diff --git a/test_util.h b/test_util.h
index 67e975da50644d483d13a2f08a7bd5970fdb611a..407824d5441ddc34e4770ff54cf95e09eda28a00 100644 (file)
--- a/test_util.h
+++ b/test_util.h
@@ -8,7 +8,8 @@ public:
        EffectChainTester(const float *data, unsigned width, unsigned height,
                          MovitPixelFormat pixel_format = FORMAT_GRAYSCALE,
                          Colorspace color_space = COLORSPACE_sRGB,
-                         GammaCurve gamma_curve = GAMMA_LINEAR);
+                         GammaCurve gamma_curve = GAMMA_LINEAR,
+                         GLenum framebuffer_format = GL_RGBA16F_ARB);
        ~EffectChainTester();
        
        EffectChain *get_chain() { return &chain; }