From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 26 Jan 2014 01:44:17 +0000 (+0100)
Subject: In EffectChainTest, do not re-call init_movit()
X-Git-Tag: 1.0~51
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=03b416172e9db37845b8c897d51064cbc6b3aa3f;ds=sidebyside

In EffectChainTest, do not re-call init_movit()

Seemingly this causes problems on ATI, for unknown reasons.
In any case, just flipping the debug level is much easier.
---

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index ab71b4b..25cd50a 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -958,8 +958,6 @@ TEST(EffectChainTest, VirtualSizeIsSentOnToInputs) {
 	expect_equal(data, out_data, size, size);
 }
 
-extern bool movit_initialized;
-
 // Does not use EffectChainTest, so that it can construct an EffectChain without
 // a shared ResourcePool (which is also properly destroyed afterwards).
 // Also turns on debugging to test that code path.
@@ -976,8 +974,7 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
 	float out_data[6];
 
 	EffectChain chain(width, height);
-	movit_initialized = false;
-	init_movit(".", MOVIT_DEBUG_ON);
+	movit_debug_level = MOVIT_DEBUG_ON;
 
 	ImageFormat format;
 	format.color_space = COLORSPACE_sRGB;
@@ -1020,6 +1017,5 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
 	expect_equal(expected_data, out_data, width, height);
 
 	// Reset the debug status again.
-	movit_initialized = false;
-	init_movit(".", MOVIT_DEBUG_OFF);
+	movit_debug_level = MOVIT_DEBUG_OFF;
 }