Make the initializing functions also drop fixed function usage.

[movit] / test_util.cpp

diff --git a/test_util.cpp b/test_util.cpp
index be34583805df68a2da1cedc5e8212eb380bf8cdf..c7c2ac01d13343a660c0231d0429e60b15de9186 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -1,11 +1,12 @@
 #include <assert.h>
-#include <gtest/gtest-message.h>
 #include <math.h>
 #include <stdio.h>
 #include <algorithm>
 
 #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"
@@ -13,6 +14,8 @@
 
 using namespace std;
 
+namespace movit {
+
 class Input;
 
 namespace {
@@ -46,7 +49,7 @@ 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);
@@ -243,3 +246,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