Don't use GL_RGBA32F/GL_RGBA16F with GL_UNSIGNED_BYTE.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index a35bbea594a02ce9882d4a449805a28a00d8c63c..f48ff7fffcc8bbd4cf6478b1aec5d12b22ae74f4 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -1,19 +1,35 @@
 #include <assert.h>
-#include <gtest/gtest-message.h>
 #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 "gtest/gtest.h"
 #include "init.h"
+#include "resource_pool.h"
 #include "test_util.h"
 #include "util.h"
 
+using namespace std;
+
+namespace movit {
+
 class Input;
 
 namespace {
 
+// Not thread-safe, but this isn't a big problem for testing.
+ResourcePool *get_static_pool()
+{
+       static ResourcePool *resource_pool = NULL;
+       if (!resource_pool) {
+               resource_pool = new ResourcePool();
+       }
+       return resource_pool;
+}
+
 // Flip upside-down to compensate for different origin.
 template<class T>
 void vertical_flip(T *data, unsigned width, unsigned height)
@@ -21,7 +37,7 @@ void vertical_flip(T *data, unsigned width, unsigned height)
        for (unsigned y = 0; y < height / 2; ++y) {
                unsigned flip_y = height - y - 1;
                for (unsigned x = 0; x < width; ++x) {
-                       std::swap(data[y * width + x], data[flip_y * width + x]);
+                       swap(data[y * width + x], data[flip_y * width + x]);
                }
        }
 }
@@ -31,9 +47,9 @@ void vertical_flip(T *data, unsigned width, unsigned height)
 EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned height,
                                      MovitPixelFormat pixel_format, Colorspace color_space, GammaCurve gamma_curve,
                                      GLenum framebuffer_format)
-       : chain(width, height), width(width), height(height), finalized(false)
+       : chain(width, height, get_static_pool()), width(width), height(height), finalized(false)
 {
-       init_movit(".", MOVIT_DEBUG_ON);
+       CHECK(init_movit(".", MOVIT_DEBUG_OFF));
 
        if (data != NULL) {
                add_input(data, pixel_format, color_space, gamma_curve);
@@ -43,7 +59,7 @@ EffectChainTester::EffectChainTester(const float *data, unsigned width, unsigned
        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, GL_FLOAT, NULL);
        check_error();
 
        glGenFramebuffers(1, &fbo);
@@ -69,25 +85,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;
@@ -230,3 +260,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