X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test_util.cpp;h=59c0ef420a43e04b846fa55a946b927ddddba180;hb=9651a4eaae012cdc49c1aa38197861e04f62e91e;hp=a35bbea594a02ce9882d4a449805a28a00d8c63c;hpb=245513f7873fca03be3f031beddaca716d7536d9;p=movit

diff --git a/test_util.cpp b/test_util.cpp
index a35bbea..59c0ef4 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -1,19 +1,33 @@
 #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"
 #include "util.h"
 
+using namespace std;
+
 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 +35,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 +45,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);
+	init_movit(".", MOVIT_DEBUG_OFF);
 
 	if (data != NULL) {
 		add_input(data, pixel_format, color_space, gamma_curve);