X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=a2ed61e4a9c554d48d9ea745b34429dcdec61f6f;hp=ecf0b6919cdcce0afbc93b91b73c5f5dd06ea0ff;hb=1547d2758dbf397602f9805e23620c1d0211f33d;hpb=f5e3256da7d8e3a56c002da47bedf8ec1a2133f4

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index ecf0b69..a2ed61e 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -129,6 +129,10 @@ TEST_P(WithAndWithoutComputeShaderTest, TopLeftOrigin) {
 	EffectChainTester tester(data, 3, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.get_chain()->set_output_origin(OUTPUT_ORIGIN_TOP_LEFT);
 	if (GetParam() == "compute") {
+		if (!movit_compute_shaders_supported) {
+			fprintf(stderr, "Skipping test; no support for compile shaders.\n");
+			return;
+		}
 		tester.get_chain()->add_effect(new IdentityComputeEffect());
 	}
 	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
@@ -791,7 +795,6 @@ public:
 
 private:
 	const MipmapRequirements mipmap_requirements;
-	EffectChain *chain;
 	float offset[2] { 0.0f, 0.0f };
 };
 
@@ -826,17 +829,17 @@ TEST(EffectChainTest, MipmapChainGetsSplit) {
 	float out_data[4 * 4];
 
 	float offset[] = { -0.5f / 4.0f, -0.5f / 4.0f };
-	RewritingEffect<Downscale2xEffect> *pick_out_top_left = new RewritingEffect<Downscale2xEffect>(Effect::CANNOT_ACCEPT_MIPMAPS);
-	ASSERT_TRUE(pick_out_top_left->effect->set_vec2("offset", offset));
+	RewritingEffect<Downscale2xEffect> *pick_out_bottom_left = new RewritingEffect<Downscale2xEffect>(Effect::CANNOT_ACCEPT_MIPMAPS);
+	ASSERT_TRUE(pick_out_bottom_left->effect->set_vec2("offset", offset));
 
 	RewritingEffect<Downscale2xEffect> *downscale2x = new RewritingEffect<Downscale2xEffect>(Effect::NEEDS_MIPMAPS);
 
 	EffectChainTester tester(data, 4, 4, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
-	tester.get_chain()->add_effect(pick_out_top_left);
+	tester.get_chain()->add_effect(pick_out_bottom_left);
 	tester.get_chain()->add_effect(downscale2x);
 	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 
-	EXPECT_NE(pick_out_top_left->replaced_node->containing_phase,
+	EXPECT_NE(pick_out_bottom_left->replaced_node->containing_phase,
 	          downscale2x->replaced_node->containing_phase);
 
 	expect_equal(expected_data, out_data, 4, 4);
@@ -951,6 +954,78 @@ TEST(EffectChainTest, DiamondGraphWithOneInputUsedInTwoPhases) {
 	expect_equal(expected_data, out_data, 2, 2);
 }
 
+// Constructs the graph
+//
+//                        FlatInput                               |
+//                       /         \                              |
+//  Downscale2xEffect (mipmaps)  Downscale2xEffect (no mipmaps)   |
+//                      |           |                             |
+//  Downscale2xEffect (mipmaps)  Downscale2xEffect (no mipmaps)   |
+//                       \         /                              |
+//                        AddEffect                               |
+//
+// and verifies that it gives the correct output. Due to the conflicting
+// mipmap demands, EffectChain needs to make two phases; exactly where it's
+// split is less important, though (this is a fairly obscure situation that
+// is unlikely to happen in practice).
+TEST(EffectChainTest, DiamondGraphWithConflictingMipmaps) {
+	float data[] = {
+		0.0f, 0.0f, 0.0f, 0.0f,
+		1.0f, 0.0f, 1.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 0.0f,
+		1.0f, 0.0f, 1.0f, 0.0f,
+	};
+
+	// Same situation as MipmapChainGetsSplit. The output of the two
+	// downscales with no mipmaps looks like this:
+	//
+	//    0 0 0 0
+	//    0 0 0 0
+	//    0 0 0 0
+	//    1 0 0 0
+	//
+	// and the one with mipmaps is 0.25 everywhere. Due to postmultiplied
+	// alpha, we get the average even though we are using AddEffect.
+	float expected_data[] = {
+		0.125f, 0.125f, 0.125f, 0.125f,
+		0.125f, 0.125f, 0.125f, 0.125f,
+		0.125f, 0.125f, 0.125f, 0.125f,
+		0.625f, 0.125f, 0.125f, 0.125f,
+	};
+	float out_data[4 * 4];
+
+	float offset[] = { -0.5f / 4.0f, -0.5f / 4.0f };
+	Downscale2xEffect *nomipmap1 = new Downscale2xEffect(Effect::CANNOT_ACCEPT_MIPMAPS);
+	Downscale2xEffect *nomipmap2 = new Downscale2xEffect(Effect::CANNOT_ACCEPT_MIPMAPS);
+	ASSERT_TRUE(nomipmap1->set_vec2("offset", offset));
+	ASSERT_TRUE(nomipmap2->set_vec2("offset", offset));
+
+	Downscale2xEffect *mipmap1 = new Downscale2xEffect(Effect::NEEDS_MIPMAPS);
+	Downscale2xEffect *mipmap2 = new Downscale2xEffect(Effect::NEEDS_MIPMAPS);
+
+	EffectChainTester tester(nullptr, 4, 4);
+
+	ImageFormat format;
+	format.color_space = COLORSPACE_sRGB;
+	format.gamma_curve = GAMMA_LINEAR;
+
+	FlatInput *input = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 4);
+	input->set_pixel_data(data);
+
+	tester.get_chain()->add_input(input);
+
+	tester.get_chain()->add_effect(nomipmap1, input);
+	tester.get_chain()->add_effect(nomipmap2, nomipmap1);
+
+	tester.get_chain()->add_effect(mipmap1, input);
+	tester.get_chain()->add_effect(mipmap2, mipmap1);
+
+	tester.get_chain()->add_effect(new AddEffect(), nomipmap2, mipmap2);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, 4, 4);
+}
+
 TEST(EffectChainTest, EffectUsedTwiceOnlyGetsOneGammaConversion) {
 	float data[] = {
 		0.735f, 0.0f,
@@ -1223,6 +1298,10 @@ TEST_P(WithAndWithoutComputeShaderTest, NoBounceWithOneToOneSampling) {
 	RewritingEffect<OneToOneEffect> *effect2 = new RewritingEffect<OneToOneEffect>();
 
 	if (GetParam() == "compute") {
+		if (!movit_compute_shaders_supported) {
+			fprintf(stderr, "Skipping test; no support for compile shaders.\n");
+			return;
+		}
 		tester.get_chain()->add_effect(new IdentityComputeEffect());
 	} else {
 		tester.get_chain()->add_effect(new NonVirtualResizeEffect(size, size));
@@ -1477,6 +1556,10 @@ TEST_P(WithAndWithoutComputeShaderTest, SquareRoot10bitIntermediateAccuracy) {
 	EffectChainTester tester(data, size, 1, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, GL_RGBA32F);
 	tester.get_chain()->set_intermediate_format(GL_RGB10_A2, SQUARE_ROOT_FRAMEBUFFER_TRANSFORMATION);
 	if (GetParam() == "compute") {
+		if (!movit_compute_shaders_supported) {
+			fprintf(stderr, "Skipping test; no support for compile shaders.\n");
+			return;
+		}
 		tester.get_chain()->add_effect(new IdentityComputeEffect());
 	} else {
 		tester.get_chain()->add_effect(new IdentityEffect());
@@ -1646,6 +1729,10 @@ TEST(ComputeShaderTest, ComputeThenOneToOne) {
 	};
 	float out_data[8];
 	EffectChainTester tester(data, 4, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR);
+	if (!movit_compute_shaders_supported) {
+		fprintf(stderr, "Skipping test; no support for compile shaders.\n");
+		return;
+	}
 	tester.get_chain()->add_effect(new MirrorComputeEffect());
 	tester.get_chain()->add_effect(new OneToOneEffect());
 	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
@@ -1689,6 +1776,10 @@ TEST(ComputeShaderTest, ResizingComputeThenOneToOne) {
 	};
 	float out_data[2];
 	EffectChainTester tester(nullptr, 2, 1);
+	if (!movit_compute_shaders_supported) {
+		fprintf(stderr, "Skipping test; no support for compile shaders.\n");
+		return;
+	}
 	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, 4, 2);
 
 	RewritingEffect<Downscale2xComputeEffect> *downscale_effect = new RewritingEffect<Downscale2xComputeEffect>();
@@ -1704,4 +1795,207 @@ TEST(ComputeShaderTest, ResizingComputeThenOneToOne) {
 	EXPECT_EQ(1u, phase->output_height);
 }
 
+class StrongOneToOneAddEffect : public AddEffect {
+public:
+	StrongOneToOneAddEffect() {}
+	string effect_type_id() const override { return "StrongOneToOneAddEffect"; }
+	bool strong_one_to_one_sampling() const override { return true; }
+};
+
+TEST(ComputeShaderTest, NoTwoComputeInSamePhase) {
+	float data[] = {
+		0.0f, 0.25f, 0.3f, 0.8f,
+		0.75f, 1.0f, 1.0f, 0.2f,
+	};
+	float expected_data[] = {
+		0.0f, 0.3f,
+	};
+	float out_data[2];
+
+	ImageFormat format;
+	format.color_space = COLORSPACE_sRGB;
+	format.gamma_curve = GAMMA_LINEAR;
+
+	EffectChainTester tester(nullptr, 2, 1);
+	if (!movit_compute_shaders_supported) {
+		fprintf(stderr, "Skipping test; no support for compile shaders.\n");
+		return;
+	}
+
+	FlatInput *input1 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2);
+	input1->set_pixel_data(data);
+	tester.get_chain()->add_input(input1);
+	Effect *downscale1 = tester.get_chain()->add_effect(new Downscale2xComputeEffect());
+
+	FlatInput *input2 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2);
+	input2->set_pixel_data(data);
+	tester.get_chain()->add_input(input2);
+	Effect *downscale2 = tester.get_chain()->add_effect(new Downscale2xComputeEffect());
+
+	tester.get_chain()->add_effect(new StrongOneToOneAddEffect(), downscale1, downscale2);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+	expect_equal(expected_data, out_data, 2, 1);
+}
+
+// Like the previous test, but the adder effect is not directly connected
+// to the compute shaders (so the status has to be propagated through those effects).
+TEST(ComputeShaderTest, NoTwoComputeInSamePhaseIndirect) {
+	float data[] = {
+		0.0f, 0.25f, 0.3f, 0.8f,
+		0.75f, 1.0f, 1.0f, 0.2f,
+	};
+	float expected_data[] = {
+		0.0f, 0.3f,
+	};
+	float out_data[2];
+
+	ImageFormat format;
+	format.color_space = COLORSPACE_sRGB;
+	format.gamma_curve = GAMMA_LINEAR;
+
+	EffectChainTester tester(nullptr, 2, 1);
+	if (!movit_compute_shaders_supported) {
+		fprintf(stderr, "Skipping test; no support for compile shaders.\n");
+		return;
+	}
+
+	FlatInput *input1 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2);
+	input1->set_pixel_data(data);
+	tester.get_chain()->add_input(input1);
+	tester.get_chain()->add_effect(new Downscale2xComputeEffect());
+	Effect *identity1 = tester.get_chain()->add_effect(new OneToOneEffect());
+
+	FlatInput *input2 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2);
+	input2->set_pixel_data(data);
+	tester.get_chain()->add_input(input2);
+	tester.get_chain()->add_effect(new Downscale2xComputeEffect());
+	Effect *identity2 = tester.get_chain()->add_effect(new OneToOneEffect());
+
+	tester.get_chain()->add_effect(new StrongOneToOneAddEffect(), identity1, identity2);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+	expect_equal(expected_data, out_data, 2, 1);
+}
+
+// Like the previous test, but the adder is not strong one-to-one
+// (so there are two different compute shader inputs, but none of them
+// are in the same phase).
+TEST(ComputeShaderTest, BounceTextureFromTwoComputeShaders) {
+	float data[] = {
+		0.0f, 0.25f, 0.3f, 0.8f,
+		0.75f, 1.0f, 1.0f, 0.2f,
+	};
+	float expected_data[] = {
+		0.0f, 0.3f,
+	};
+	float out_data[2];
+
+	ImageFormat format;
+	format.color_space = COLORSPACE_sRGB;
+	format.gamma_curve = GAMMA_LINEAR;
+
+	EffectChainTester tester(nullptr, 2, 1);
+	if (!movit_compute_shaders_supported) {
+		fprintf(stderr, "Skipping test; no support for compile shaders.\n");
+		return;
+	}
+
+	FlatInput *input1 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2);
+	input1->set_pixel_data(data);
+	tester.get_chain()->add_input(input1);
+	tester.get_chain()->add_effect(new Downscale2xComputeEffect());
+	Effect *identity1 = tester.get_chain()->add_effect(new OneToOneEffect());
+
+	FlatInput *input2 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2);
+	input2->set_pixel_data(data);
+	tester.get_chain()->add_input(input2);
+	tester.get_chain()->add_effect(new Downscale2xComputeEffect());
+	Effect *identity2 = tester.get_chain()->add_effect(new OneToOneEffect());
+
+	tester.get_chain()->add_effect(new AddEffect(), identity1, identity2);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+	expect_equal(expected_data, out_data, 2, 1);
+}
+
+// Requires mipmaps, but is otherwise like IdentityEffect.
+class MipmapNeedingIdentityEffect : public IdentityEffect {
+public:
+	MipmapNeedingIdentityEffect() {}
+	MipmapRequirements needs_mipmaps() const override { return NEEDS_MIPMAPS; }
+	string effect_type_id() const override { return "MipmapNeedingIdentityEffect"; }
+	bool strong_one_to_one_sampling() const override { return true; }
+};
+
+TEST(ComputeShaderTest, StrongOneToOneButStillNotChained) {
+	float data[] = {
+		0.0f, 0.25f, 0.3f, 0.8f,
+		0.75f, 1.0f, 1.0f, 0.2f,
+	};
+	float out_data[8];
+
+	ImageFormat format;
+	format.color_space = COLORSPACE_sRGB;
+	format.gamma_curve = GAMMA_LINEAR;
+
+	EffectChainTester tester(nullptr, 4, 2);
+	if (!movit_compute_shaders_supported) {
+		fprintf(stderr, "Skipping test; no support for compile shaders.\n");
+		return;
+	}
+
+	FlatInput *input1 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2);
+	input1->set_pixel_data(data);
+	tester.get_chain()->add_input(input1);
+	Effect *compute_effect = tester.get_chain()->add_effect(new IdentityComputeEffect());
+
+	FlatInput *input2 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2);
+	input2->set_pixel_data(data);
+	tester.get_chain()->add_input(input2);
+
+	// Not chained with the compute shader because MipmapNeedingIdentityEffect comes in
+	// the same phase, and compute shaders cannot supply mipmaps.
+	tester.get_chain()->add_effect(new StrongOneToOneAddEffect(), compute_effect, input2);
+	tester.get_chain()->add_effect(new MipmapNeedingIdentityEffect());
+
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+	expect_equal(data, out_data, 4, 2);
+}
+
+TEST(EffectChainTest, BounceResetsMipmapNeeds) {
+	float data[] = {
+		0.0f, 0.25f,
+		0.75f, 1.0f,
+	};
+	float out_data[1];
+
+	ImageFormat format;
+	format.color_space = COLORSPACE_sRGB;
+	format.gamma_curve = GAMMA_LINEAR;
+
+	NonMipmapCapableInput *input = new NonMipmapCapableInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 2, 2);
+	input->set_pixel_data(data);
+
+	RewritingEffect<IdentityEffect> *identity = new RewritingEffect<IdentityEffect>();
+
+	RewritingEffect<ResizeEffect> *downscale = new RewritingEffect<ResizeEffect>();  // Needs mipmaps.
+	ASSERT_TRUE(downscale->effect->set_int("width", 1));
+	ASSERT_TRUE(downscale->effect->set_int("height", 1));
+
+	EffectChainTester tester(nullptr, 1, 1);
+	tester.get_chain()->add_input(input);
+	tester.get_chain()->add_effect(identity);
+	tester.get_chain()->add_effect(downscale);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	Node *input_node = identity->replaced_node->incoming_links[0];
+
+	// The ResizeEffect needs mipmaps. Normally, that would mean that it should
+	// propagate this tatus down through the IdentityEffect. However, since we
+	// bounce (due to the resize), the dependency breaks there, and we don't
+	// need to bounce again between the input and the IdentityEffect.
+	EXPECT_EQ(input_node->containing_phase,
+	          identity->replaced_node->containing_phase);
+	EXPECT_NE(identity->replaced_node->containing_phase,
+	          downscale->replaced_node->containing_phase);
+}
+
 }  // namespace movit