Make it easier to turn on debug for the EffectChain test without having it be turned...

[movit] / effect_chain_test.cpp

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index 324ddaee0c46747d818c5e7b788efeaa5784cf19..73f13c7957d7c8c4c0b66ea4cd50f4e464b6462b 100644 (file)
--- 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<string> {
+};
+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);
@@ -1113,21 +1131,6 @@ public:
        bool sets_virtual_output_size() const override { return false; }
 };
 
-class WithAndWithoutComputeShaderTest : public testing::TestWithParam<string> {
-};
-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"); }
-};
-
 // An effect that promises one-to-one sampling (unlike IdentityEffect).
 class OneToOneEffect : public Effect {
 public:
@@ -1225,6 +1228,7 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
        float out_data[6], temp[6 * 4];
 
        EffectChain chain(width, height);
+       MovitDebugLevel old_movit_debug_level = movit_debug_level;
        movit_debug_level = MOVIT_DEBUG_ON;
 
        ImageFormat format;
@@ -1273,7 +1277,7 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
        expect_equal(expected_data, out_data, width, height);
 
        // Reset the debug status again.
-       movit_debug_level = MOVIT_DEBUG_OFF;
+       movit_debug_level = old_movit_debug_level;
 }
 
 // A dummy effect whose only purpose is to test sprintf decimal behavior.
@@ -1580,4 +1584,55 @@ TEST(ComputeShaderTest, ComputeThenOneToOne) {
        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<Downscale2xComputeEffect> *downscale_effect = new RewritingEffect<Downscale2xComputeEffect>();
+       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