Add a function for EffectChainTester to get out the uint8 result.

diff --git a/test_util.cpp b/test_util.cpp
index cd79bd7c5adc973c1c29ea58449a8d5434878292..3aecd54463a9c6213e53e22dcbf26122ae64ff68 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -106,6 +106,24 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa
        vertical_flip(out_data, width, height);
 }
 
        vertical_flip(out_data, width, height);
 }
 

+void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve)
+{
+       if (!finalized) {
+               finalize_chain(color_space, gamma_curve);
+       }
+
+       chain.render_to_fbo(fbo, width, height);
+
+       glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+       glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data);
+
+       if (format == GL_RGBA) {
+               width *= 4;
+       }
+
+       vertical_flip(out_data, width, height);
+}
+

 void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve)
 {
        assert(!finalized);
 void EffectChainTester::finalize_chain(Colorspace color_space, GammaCurve gamma_curve)
 {
        assert(!finalized);

diff --git a/test_util.h b/test_util.h
index d149fe135d8b2e381e160a983469a2a991a194cb..412acadd912f3423d8df35c4bbeff552636cd441 100644 (file)
--- a/test_util.h
+++ b/test_util.h
@@ -15,6 +15,7 @@ public:
        Input *add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);
        Input *add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);
        void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve);
        Input *add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);
        Input *add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve);
        void run(float *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve);

+       void run(unsigned char *out_data, GLenum format, Colorspace color_space, GammaCurve gamma_curve);

 
 private:
        void finalize_chain(Colorspace color_space, GammaCurve gamma_curve);
 
 private:
        void finalize_chain(Colorspace color_space, GammaCurve gamma_curve);