Use the GL_RED texture format instead of GL_LUMINANCE.

[movit] / effect_chain_test.cpp

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index ab71b4b5026ebfd1b5649849f5754700ed85ee4f..cf725f1131bb1eae8a1722c1e2989893d8c178be 100644 (file)
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -19,6 +19,8 @@
 
 using namespace std;
 
+namespace movit {
+
 TEST(EffectChainTest, EmptyChain) {
        float data[] = {
                0.0f, 0.25f, 0.3f,
@@ -958,8 +960,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 +976,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 +1019,7 @@ 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;
 }
+
+}  // namespace movit