X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=aa574fca795ae364477ef1bbd56aec58dc18655c;hp=ecf0b6919cdcce0afbc93b91b73c5f5dd06ea0ff;hb=10bcc7948c3911f1e4459c98205726334998229e;hpb=f5e3256da7d8e3a56c002da47bedf8ec1a2133f4 diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp index ecf0b69..aa574fc 100644 --- a/effect_chain_test.cpp +++ b/effect_chain_test.cpp @@ -826,17 +826,17 @@ TEST(EffectChainTest, MipmapChainGetsSplit) { float out_data[4 * 4]; float offset[] = { -0.5f / 4.0f, -0.5f / 4.0f }; - RewritingEffect *pick_out_top_left = new RewritingEffect(Effect::CANNOT_ACCEPT_MIPMAPS); - ASSERT_TRUE(pick_out_top_left->effect->set_vec2("offset", offset)); + RewritingEffect *pick_out_bottom_left = new RewritingEffect(Effect::CANNOT_ACCEPT_MIPMAPS); + ASSERT_TRUE(pick_out_bottom_left->effect->set_vec2("offset", offset)); RewritingEffect *downscale2x = new RewritingEffect(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 +951,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, @@ -1704,4 +1776,113 @@ 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); + + 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); + + 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); + + 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); +} + } // namespace movit