X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=mix_effect_test.cpp;h=b5082846abc13e6ec76ff37d9dfe1ec6b7032ab7;hp=cae4b28795ac078e7c7ce525e65bf4e35836f067;hb=919101c59390dbbe380af7cc77102819e515a632;hpb=f52ae2984b179e8d91e3d78ecc72888644fce406

diff --git a/mix_effect_test.cpp b/mix_effect_test.cpp
index cae4b28..b508284 100644
--- a/mix_effect_test.cpp
+++ b/mix_effect_test.cpp
@@ -1,8 +1,15 @@
 // Unit tests for MixEffect.
 
-#include "test_util.h"
+#include <epoxy/gl.h>
+
+#include "effect_chain.h"
 #include "gtest/gtest.h"
+#include "image_format.h"
+#include "input.h"
 #include "mix_effect.h"
+#include "test_util.h"
+
+namespace movit {
 
 TEST(MixEffectTest, FiftyFiftyMix) {
 	float data_a[] = {
@@ -18,14 +25,14 @@ TEST(MixEffectTest, FiftyFiftyMix) {
 		0.75f, 0.8f,
 	};
 	float out_data[4];
-	EffectChainTester tester(data_a, 2, 2, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data_a, 2, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input2 = tester.add_input(data_b, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	Effect *mix_effect = tester.get_chain()->add_effect(new MixEffect(), input1, input2);
 	ASSERT_TRUE(mix_effect->set_float("strength_first", 0.5f));
 	ASSERT_TRUE(mix_effect->set_float("strength_second", 0.5f));
-	tester.run(out_data, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(expected_data, out_data, 2, 2);
 }
@@ -40,42 +47,72 @@ TEST(MixEffectTest, OnlyA) {
 		0.75f, 0.6f,
 	};
 	float out_data[4];
-	EffectChainTester tester(data_a, 2, 2, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data_a, 2, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input2 = tester.add_input(data_b, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	Effect *mix_effect = tester.get_chain()->add_effect(new MixEffect(), input1, input2);
 	ASSERT_TRUE(mix_effect->set_float("strength_first", 1.0f));
 	ASSERT_TRUE(mix_effect->set_float("strength_second", 0.0f));
-	tester.run(out_data, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(data_a, out_data, 2, 2);
 }
 
 TEST(MixEffectTest, DoesNotSumToOne) {
 	float data_a[] = {
-		1.0f, 0.5f,
-		0.75f, 1.0f,
+		1.0f, 0.5f, 0.75f, 0.333f,
 	};
 	float data_b[] = {
-		1.0f, 0.25f,
-		0.15f, 0.6f,
+		1.0f, 0.25f, 0.15f, 0.333f,
 	};
+
+	// The fact that the RGB values don't sum but get averaged here might
+	// actually be a surprising result, but when you think of it,
+	// it does make physical sense.
 	float expected_data[] = {
-		0.0f, 0.25f,
-		0.6f, 0.4f,
+		1.0f, 0.375f, 0.45f, 0.666f,
 	};
+
 	float out_data[4];
-	EffectChainTester tester(data_a, 2, 2, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data_a, 1, 1, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input2 = tester.add_input(data_b, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	Effect *mix_effect = tester.get_chain()->add_effect(new MixEffect(), input1, input2);
 	ASSERT_TRUE(mix_effect->set_float("strength_first", 1.0f));
-	ASSERT_TRUE(mix_effect->set_float("strength_second", -1.0f));
-	tester.run(out_data, COLORSPACE_sRGB, GAMMA_LINEAR);
+	ASSERT_TRUE(mix_effect->set_float("strength_second", 1.0f));
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-	expect_equal(expected_data, out_data, 2, 2);
+	expect_equal(expected_data, out_data, 4, 1);
+}
+
+TEST(MixEffectTest, AdditiveBlendingWorksForBothTotallyOpaqueAndPartiallyTranslucent) {
+	float data_a[] = {
+		0.0f, 0.5f, 0.75f, 1.0f,
+		1.0f, 1.0f, 1.0f, 0.2f,
+	};
+	float data_b[] = {
+		1.0f, 0.25f, 0.15f, 1.0f,
+		1.0f, 1.0f, 1.0f, 0.5f,
+	};
+
+	float expected_data[] = {
+		1.0f, 0.75f, 0.9f, 1.0f,
+		1.0f, 1.0f, 1.0f, 0.7f,
+	};
+
+	float out_data[8];
+	EffectChainTester tester(data_a, 1, 2, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input1 = tester.get_chain()->last_added_effect();
+	Effect *input2 = tester.add_input(data_b, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	Effect *mix_effect = tester.get_chain()->add_effect(new MixEffect(), input1, input2);
+	ASSERT_TRUE(mix_effect->set_float("strength_first", 1.0f));
+	ASSERT_TRUE(mix_effect->set_float("strength_second", 1.0f));
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, 4, 2);
 }
 
 TEST(MixEffectTest, MixesLinearlyDespitesRGBInputsAndOutputs) {
@@ -92,14 +129,16 @@ TEST(MixEffectTest, MixesLinearlyDespitesRGBInputsAndOutputs) {
 		0.54807f, 0.73536f,
 	};
 	float out_data[4];
-	EffectChainTester tester(data_a, 2, 2, COLORSPACE_sRGB, GAMMA_sRGB);
+	EffectChainTester tester(data_a, 2, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_sRGB);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, COLORSPACE_sRGB, GAMMA_sRGB);
+	Effect *input2 = tester.add_input(data_b, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_sRGB);
 
 	Effect *mix_effect = tester.get_chain()->add_effect(new MixEffect(), input1, input2);
 	ASSERT_TRUE(mix_effect->set_float("strength_first", 0.5f));
 	ASSERT_TRUE(mix_effect->set_float("strength_second", 0.5f));
-	tester.run(out_data, COLORSPACE_sRGB, GAMMA_sRGB);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB);
 
 	expect_equal(expected_data, out_data, 2, 2);
 }
+
+}  // namespace movit