Remove some unused members in tests. Found by Clang 7.

[movit] / effect_chain_test.cpp

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index f51f988bdad220a3b4c259ec55a9eaea477bc844..6f930dafbc642781a9c48863f70175d96e9323a6 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 };
 };
 
@@ -1776,4 +1775,153 @@ 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);
+}
+
+// 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);
+}
+
 }  // namespace movit