X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=f37738d57208345c4afe1ab9f88d7756ec7c6bfd;hp=92fe52b1ecfcd0974ecf5e252f0de6b538b5beaf;hb=376535a970b25a268bef44cd3c32a3630e605734;hpb=39b6975420669958ed9f4013440aea415134a902 diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp index 92fe52b..f37738d 100644 --- a/effect_chain_test.cpp +++ b/effect_chain_test.cpp @@ -99,7 +99,22 @@ TEST(MirrorTest, BasicTest) { expect_equal(expected_data, out_data, 3, 2); } -TEST(EffectChainTest, TopLeftOrigin) { +class WithAndWithoutComputeShaderTest : public testing::TestWithParam { +}; +INSTANTIATE_TEST_CASE_P(WithAndWithoutComputeShaderTest, + WithAndWithoutComputeShaderTest, + testing::Values("fragment", "compute")); + +// An effect that does nothing, but as a compute shader. +class IdentityComputeEffect : public Effect { +public: + IdentityComputeEffect() {} + virtual string effect_type_id() const { return "IdentityComputeEffect"; } + virtual bool is_compute_shader() const { return true; } + string output_fragment_shader() { return read_file("identity.comp"); } +}; + +TEST_P(WithAndWithoutComputeShaderTest, TopLeftOrigin) { float data[] = { 0.0f, 0.25f, 0.3f, 0.75f, 1.0f, 1.0f, @@ -113,6 +128,9 @@ TEST(EffectChainTest, TopLeftOrigin) { 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); + if (GetParam() == "compute") { + tester.get_chain()->add_effect(new IdentityComputeEffect()); + } tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR); expect_equal(expected_data, out_data, 3, 2); @@ -1119,10 +1137,10 @@ public: OneToOneEffect() {} string effect_type_id() const override { return "OneToOneEffect"; } string output_fragment_shader() override { return read_file("identity.frag"); } - bool one_to_one_sampling() const override { return true; } + bool strong_one_to_one_sampling() const override { return true; } }; -TEST(EffectChainTest, NoBounceWithOneToOneSampling) { +TEST_P(WithAndWithoutComputeShaderTest, NoBounceWithOneToOneSampling) { const int size = 2; float data[size * size] = { 1.0f, 0.0f, @@ -1135,7 +1153,11 @@ TEST(EffectChainTest, NoBounceWithOneToOneSampling) { RewritingEffect *effect1 = new RewritingEffect(); RewritingEffect *effect2 = new RewritingEffect(); - tester.get_chain()->add_effect(new NonVirtualResizeEffect(size, size)); + if (GetParam() == "compute") { + tester.get_chain()->add_effect(new IdentityComputeEffect()); + } else { + 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); @@ -1302,21 +1324,6 @@ TEST(EffectChainTest, StringStreamLocalesWork) { free(saved_locale); } -// An effect that does nothing, but as a compute shader. -class IdentityComputeEffect : public Effect { -public: - IdentityComputeEffect() {} - string effect_type_id() const override { return "IdentityComputeEffect"; } - bool is_compute_shader() const override { return true; } - string output_fragment_shader() override { return read_file("identity.comp"); } -}; - -class WithAndWithoutComputeShaderTest : public testing::TestWithParam { -}; -INSTANTIATE_TEST_CASE_P(WithAndWithoutComputeShaderTest, - WithAndWithoutComputeShaderTest, - testing::Values("fragment", "compute")); - TEST(EffectChainTest, sRGBIntermediate) { float data[] = { 0.0f, 0.5f, 0.0f, 1.0f, @@ -1543,4 +1550,88 @@ TEST(ComputeShaderTest, Render8BitTo8Bit) { expect_equal(data, out_data, 3, 2); } +// A compute shader to mirror the inputs, in 2x2 blocks. +class MirrorComputeEffect : public Effect { +public: + MirrorComputeEffect() {} + string effect_type_id() const override { return "MirrorComputeEffect"; } + bool is_compute_shader() const override { return true; } + string output_fragment_shader() override { return read_file("mirror.comp"); } + void get_compute_dimensions(unsigned output_width, unsigned output_height, + unsigned *x, unsigned *y, unsigned *z) const override { + *x = output_width / 2; + *y = output_height / 2; + *z = 1; + } +}; + +TEST(ComputeShaderTest, ComputeThenOneToOne) { + float data[] = { + 0.0f, 0.25f, 0.3f, 0.8f, + 0.75f, 1.0f, 1.0f, 0.2f, + }; + float expected_data[] = { + 0.8f, 0.3f, 0.25f, 0.0f, + 0.2f, 1.0f, 1.0f, 0.75f, + }; + float out_data[8]; + EffectChainTester tester(data, 4, 2, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR); + tester.get_chain()->add_effect(new MirrorComputeEffect()); + tester.get_chain()->add_effect(new OneToOneEffect()); + tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR); + + expect_equal(expected_data, out_data, 4, 2); +} + +// A compute shader that also resizes its input, taking the upper-left pixel +// of every 2x2 group. (The shader is hard-coded to 4x2 input for simplicity.) +class Downscale2xComputeEffect : public Effect { +public: + Downscale2xComputeEffect() {} + string effect_type_id() const override { return "Downscale2xComputeEffect"; } + bool is_compute_shader() const override { return true; } + string output_fragment_shader() override { return read_file("downscale2x.comp"); } + bool changes_output_size() const override { return true; } + void inform_input_size(unsigned input_num, unsigned width, unsigned height) override + { + this->width = width; + this->height = height; + } + void get_output_size(unsigned *width, unsigned *height, + unsigned *virtual_width, unsigned *virtual_height) const override { + *width = *virtual_width = this->width / 2; + *height = *virtual_height = this->height / 2; + } + +private: + unsigned width, height; +}; + +// Even if the compute shader is not the last effect, it's the one that should decide +// the output size of the phase. +TEST(ComputeShaderTest, ResizingComputeThenOneToOne) { + 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]; + EffectChainTester tester(nullptr, 2, 1); + tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, 4, 2); + + RewritingEffect *downscale_effect = new RewritingEffect(); + tester.get_chain()->add_effect(downscale_effect); + tester.get_chain()->add_effect(new OneToOneEffect()); + tester.get_chain()->add_effect(new BouncingIdentityEffect()); + tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR); + + expect_equal(expected_data, out_data, 2, 1); + + Phase *phase = downscale_effect->replaced_node->containing_phase; + EXPECT_EQ(2, phase->output_width); + EXPECT_EQ(1, phase->output_height); +} + } // namespace movit