Make effect_id phase-local instead of global.

[movit] / overlay_effect_test.cpp

diff --git a/overlay_effect_test.cpp b/overlay_effect_test.cpp
index 009a757e1bbaabf6e639af39a6a517c1ee2cf907..5d86ec2d409159e7ac13875d8ee7b51e20a4cc90 100644 (file)
--- a/overlay_effect_test.cpp
+++ b/overlay_effect_test.cpp
@@ -1,8 +1,13 @@
 // Unit tests for OverlayEffect.
 
-#include "test_util.h"
+#include <GL/glew.h>
+
+#include "effect_chain.h"
 #include "gtest/gtest.h"
+#include "image_format.h"
+#include "input.h"
 #include "overlay_effect.h"
+#include "test_util.h"
 
 TEST(OverlayEffectTest, TopDominatesBottomWhenNoAlpha) {
        float data_a[] = {
@@ -32,9 +37,9 @@ TEST(OverlayEffectTest, BottomDominatesTopWhenTopIsTransparent) {
                0.5f, 0.5f, 0.5f, 0.0f,
        };
        float out_data[4];
-       EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
        Effect *input1 = tester.get_chain()->last_added_effect();
-       Effect *input2 = tester.add_input(data_b, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       Effect *input2 = tester.add_input(data_b, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
        tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
        tester.run(out_data, GL_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
@@ -42,7 +47,7 @@ TEST(OverlayEffectTest, BottomDominatesTopWhenTopIsTransparent) {
        expect_equal(data_a, out_data, 4, 1);
 }
 
-TEST(OverlayEffectTest, ZeroAlphaBecomesAllZero) {
+TEST(OverlayEffectTest, ZeroAlphaRemainsZeroAlpha) {
        float data_a[] = {
                0.0f, 0.25f, 0.5f, 0.0f
        };
@@ -53,14 +58,14 @@ TEST(OverlayEffectTest, ZeroAlphaBecomesAllZero) {
                0.0f, 0.0f, 0.0f, 0.0f
        };
        float out_data[4];
-       EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
        Effect *input1 = tester.get_chain()->last_added_effect();
-       Effect *input2 = tester.add_input(data_b, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       Effect *input2 = tester.add_input(data_b, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
        tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
        tester.run(out_data, GL_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-       expect_equal(expected_data, out_data, 4, 1);
+       EXPECT_FLOAT_EQ(0.0f, expected_data[3]);
 }
 
 // This is tested against what Photoshop does: (255,0,128, 0.25) over (128,255,0, 0.5)
@@ -77,9 +82,9 @@ TEST(OverlayEffectTest, PhotoshopReferenceTest) {
                179.0f/255.0f, 153.0f/255.0f, 51.0f/255.0f, 0.625f
        };
        float out_data[4];
-       EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
        Effect *input1 = tester.get_chain()->last_added_effect();
-       Effect *input2 = tester.add_input(data_b, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+       Effect *input2 = tester.add_input(data_b, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
        tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
        tester.run(out_data, GL_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);