Convert a loop to range-based for.

[movit] / effect_chain_test.cpp

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index aa574fca795ae364477ef1bbd56aec58dc18655c..1bcaf72a9d9d7f7149c0c83239508d517375e69f 100644 (file)
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -791,7 +791,6 @@ public:
 
 private:
        const MipmapRequirements mipmap_requirements;
-       EffectChain *chain;
        float offset[2] { 0.0f, 0.0f };
 };
 
@@ -1885,4 +1884,82 @@ TEST(ComputeShaderTest, BounceTextureFromTwoComputeShaders) {
        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);
+
+       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