X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=32beb41b45df0c4e67c7490f884f3581eb2b2963;hp=516dd54ea00e84eaeaac7e2afd2e58b1f545343e;hb=e766478d4a236074000a6a17be9cba6e8b1576f3;hpb=bff07c51f937a4fdf005d31ef7e064467db67511

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index 516dd54..32beb41 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -98,6 +98,25 @@ TEST(MirrorTest, BasicTest) {
 	expect_equal(expected_data, out_data, 3, 2);
 }
 
+TEST(EffectChainTest, TopLeftOrigin) {
+	float data[] = {
+		0.0f, 0.25f, 0.3f,
+		0.75f, 1.0f, 1.0f,
+	};
+	// Note that EffectChainTester assumes bottom-left origin, so by setting
+	// top-left, we will get flipped data back.
+	float expected_data[6] = {
+		0.75f, 1.0f, 1.0f,
+		0.0f, 0.25f, 0.3f,
+	};
+	float out_data[6];
+	EffectChainTester tester(data, 3, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.get_chain()->set_output_origin(OUTPUT_ORIGIN_TOP_LEFT);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, 3, 2);
+}
+
 // A dummy effect that inverts its input.
 class InvertEffect : public Effect {
 public:
@@ -932,7 +951,7 @@ TEST(EffectChainTest, SameInputsGiveSameOutputs) {
 		0.0f, 0.0f,
 		0.0f, 0.0f,
 	};
-	float out_data[2 * 2];
+	float out_data[4 * 3];
 	
 	EffectChainTester tester(NULL, 4, 3);  // Note non-square aspect.
 
@@ -1053,6 +1072,93 @@ TEST(EffectChainTest, VirtualSizeIsSentOnToInputs) {
 	expect_equal(data, out_data, size, size);
 }
 
+// An effect that is like VirtualResizeEffect, but always has virtual and real
+// sizes the same (and promises this).
+class NonVirtualResizeEffect : public VirtualResizeEffect {
+public:
+	NonVirtualResizeEffect(int width, int height)
+		: VirtualResizeEffect(width, height, width, height) {}
+	virtual string effect_type_id() const { return "NonVirtualResizeEffect"; }
+	virtual bool sets_virtual_output_size() const { return false; }
+};
+
+// An effect that promises one-to-one sampling (unlike IdentityEffect).
+class OneToOneEffect : public Effect {
+public:
+	OneToOneEffect() {}
+	virtual string effect_type_id() const { return "OneToOneEffect"; }
+	string output_fragment_shader() { return read_file("identity.frag"); }
+	virtual bool one_to_one_sampling() const { return true; }
+};
+
+TEST(EffectChainTest, NoBounceWithOneToOneSampling) {
+	const int size = 2;
+	float data[size * size] = {
+		1.0f, 0.0f,
+		0.0f, 1.0f,
+	};
+	float out_data[size * size];
+
+	EffectChainTester tester(data, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	RewritingEffect<OneToOneEffect> *effect1 = new RewritingEffect<OneToOneEffect>();
+	RewritingEffect<OneToOneEffect> *effect2 = new RewritingEffect<OneToOneEffect>();
+
+	tester.get_chain()->add_effect(new NonVirtualResizeEffect(size, size));
+	tester.get_chain()->add_effect(effect1);
+	tester.get_chain()->add_effect(effect2);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(data, out_data, size, size);
+
+	// The first OneToOneEffect should be in the same phase as its input.
+	ASSERT_EQ(1, effect1->replaced_node->incoming_links.size());
+	EXPECT_EQ(effect1->replaced_node->incoming_links[0]->containing_phase,
+	          effect1->replaced_node->containing_phase);
+
+	// The second OneToOneEffect, too.
+	EXPECT_EQ(effect1->replaced_node->containing_phase,
+	          effect2->replaced_node->containing_phase);
+}
+
+TEST(EffectChainTest, BounceWhenOneToOneIsBroken) {
+	const int size = 2;
+	float data[size * size] = {
+		1.0f, 0.0f,
+		0.0f, 1.0f,
+	};
+	float out_data[size * size];
+
+	EffectChainTester tester(data, size, size, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	RewritingEffect<OneToOneEffect> *effect1 = new RewritingEffect<OneToOneEffect>();
+	RewritingEffect<OneToOneEffect> *effect2 = new RewritingEffect<OneToOneEffect>();
+	RewritingEffect<IdentityEffect> *effect3 = new RewritingEffect<IdentityEffect>();
+	RewritingEffect<OneToOneEffect> *effect4 = new RewritingEffect<OneToOneEffect>();
+
+	tester.get_chain()->add_effect(new NonVirtualResizeEffect(size, size));
+	tester.get_chain()->add_effect(effect1);
+	tester.get_chain()->add_effect(effect2);
+	tester.get_chain()->add_effect(effect3);
+	tester.get_chain()->add_effect(effect4);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(data, out_data, size, size);
+
+	// The NonVirtualResizeEffect should be in a different phase from
+	// the IdentityEffect (since the latter is not one-to-one),
+	// ie., the chain should be broken somewhere between them, but exactly
+	// where doesn't matter.
+	ASSERT_EQ(1, effect1->replaced_node->incoming_links.size());
+	EXPECT_NE(effect1->replaced_node->incoming_links[0]->containing_phase,
+	          effect3->replaced_node->containing_phase);
+
+	// The last OneToOneEffect should also be in the same phase as the
+	// IdentityEffect (the phase was already broken).
+	EXPECT_EQ(effect3->replaced_node->containing_phase,
+	          effect4->replaced_node->containing_phase);
+}
+
 // 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.
@@ -1142,7 +1248,12 @@ TEST(EffectChainTest, StringStreamLocalesWork) {
 	// the test will always succeed. Note that the OpenGL driver might call
 	// setlocale() behind-the-scenes, and that might corrupt the returned
 	// pointer, so we need to take our own copy of it here.
-	char *saved_locale = strdup(setlocale(LC_ALL, "nb_NO.UTF_8"));
+	char *saved_locale = setlocale(LC_ALL, "nb_NO.UTF_8");
+	if (saved_locale == NULL) {
+		// The locale wasn't available.
+		return;
+	}
+	saved_locale = strdup(saved_locale);
 	float data[] = {
 		0.0f, 0.0f, 0.0f, 0.0f,
 	};