Fix non-float framebuffers in EffectChainTester.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index 59c0ef420a43e04b846fa55a946b927ddddba180..c8759744b9853229e24e1faf7a0f0f8321157758 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -2,11 +2,11 @@
 #include <math.h>
 #include <stdio.h>
 #include <algorithm>
+#include <epoxy/gl.h>
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>
 
 #include "flat_input.h"
-#include "glew.h"
-#include "gtest/gtest.h"
-#include "gtest/gtest-message.h"
 #include "init.h"
 #include "resource_pool.h"
 #include "test_util.h"
@@ -14,6 +14,8 @@
 
 using namespace std;
 
+namespace movit {
+
 class Input;
 
 namespace {
@@ -47,17 +49,27 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
                                      GLenum framebuffer_format)
        : chain(width, height, get_static_pool()), width(width), height(height), finalized(false)
 {
-       init_movit(".", MOVIT_DEBUG_OFF);
+       CHECK(init_movit(".", MOVIT_DEBUG_OFF));
 
        if (data != NULL) {
                add_input(data, pixel_format, color_space, gamma_curve);
        }
 
+       GLuint type;
+       if (framebuffer_format == GL_RGBA8) {
+               type = GL_UNSIGNED_BYTE;
+       } else if (framebuffer_format == GL_RGBA16F || framebuffer_format == GL_RGBA32F) {
+               type = GL_FLOAT;
+       } else {
+               // Add more here as needed.
+               assert(false);
+       }
+
        glGenTextures(1, &texnum);
        check_error();
        glBindTexture(GL_TEXTURE_2D, texnum);
        check_error();
-       glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+       glTexImage2D(GL_TEXTURE_2D, 0, framebuffer_format, width, height, 0, GL_RGBA, type, NULL);
        check_error();
 
        glGenFramebuffers(1, &fbo);
@@ -83,25 +95,39 @@ EffectChainTester::~EffectChainTester()
        check_error();
 }
 
-Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const float *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
 {
        ImageFormat format;
        format.color_space = color_space;
        format.gamma_curve = gamma_curve;
 
-       FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, width, height);
+       if (input_width == -1) {
+               input_width = width;
+       }
+       if (input_height == -1) {
+               input_height = height;
+       }
+
+       FlatInput *input = new FlatInput(format, pixel_format, GL_FLOAT, input_width, input_height);
        input->set_pixel_data(data);
        chain.add_input(input);
        return input;
 }
 
-Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve)
+Input *EffectChainTester::add_input(const unsigned char *data, MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve, int input_width, int input_height)
 {
        ImageFormat format;
        format.color_space = color_space;
        format.gamma_curve = gamma_curve;
 
-       FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, width, height);
+       if (input_width == -1) {
+               input_width = width;
+       }
+       if (input_height == -1) {
+               input_height = height;
+       }
+
+       FlatInput *input = new FlatInput(format, pixel_format, GL_UNSIGNED_BYTE, input_width, input_height);
        input->set_pixel_data(data);
        chain.add_input(input);
        return input;
@@ -116,7 +142,20 @@ void EffectChainTester::run(float *out_data, GLenum format, Colorspace color_spa
        chain.render_to_fbo(fbo, width, height);
 
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-       glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
+       check_error();
+       if (!epoxy_is_desktop_gl() && format == GL_RED) {
+               // GLES will only read GL_RGBA.
+               float *temp = new float[width * height * 4];
+               glReadPixels(0, 0, width, height, GL_RGBA, GL_FLOAT, temp);
+               check_error();
+               for (int i = 0; i < width * height; ++i) {
+                       out_data[i] = temp[i * 4];
+               }
+               delete[] temp;
+       } else {
+               glReadPixels(0, 0, width, height, format, GL_FLOAT, out_data);
+               check_error();
+       }
 
        if (format == GL_RGBA) {
                width *= 4;
@@ -134,7 +173,20 @@ void EffectChainTester::run(unsigned char *out_data, GLenum format, Colorspace c
        chain.render_to_fbo(fbo, width, height);
 
        glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-       glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data);
+       check_error();
+       if (!epoxy_is_desktop_gl() && format == GL_RED) {
+               // GLES will only read GL_RGBA.
+               unsigned char *temp = new unsigned char[width * height * 4];
+               glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, temp);
+               check_error();
+               for (int i = 0; i < width * height; ++i) {
+                       out_data[i] = temp[i * 4];
+               }
+               delete[] temp;
+       } else {
+               glReadPixels(0, 0, width, height, format, GL_UNSIGNED_BYTE, out_data);
+               check_error();
+       }
 
        if (format == GL_RGBA) {
                width *= 4;
@@ -244,3 +296,5 @@ void test_accuracy(const float *expected, const float *result, unsigned num_valu
        double rms = sqrt(squared_difference) / num_values;
        EXPECT_LT(rms, rms_limit);
 }
+
+}  // namespace movit