X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=3a3811da156539c25b853756efa76b5c6d6d30ff;hp=21403541827a4f48d630e8dee85403b6dc99b696;hb=037ee905bc05fcbb278ac3a0b1f73249efada9b2;hpb=e3306f2e63af4e9c1ac2b0781f67f50906574b97 diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp index 2140354..3a3811d 100644 --- a/effect_chain_test.cpp +++ b/effect_chain_test.cpp @@ -42,8 +42,8 @@ TEST(EffectChainTest, EmptyChain) { class IdentityEffect : public Effect { public: IdentityEffect() {} - virtual string effect_type_id() const { return "IdentityEffect"; } - string output_fragment_shader() { return read_file("identity.frag"); } + string effect_type_id() const override { return "IdentityEffect"; } + string output_fragment_shader() override { return read_file("identity.frag"); } }; TEST(EffectChainTest, Identity) { @@ -63,10 +63,10 @@ TEST(EffectChainTest, Identity) { class BouncingIdentityEffect : public Effect { public: BouncingIdentityEffect() {} - virtual string effect_type_id() const { return "IdentityEffect"; } - string output_fragment_shader() { return read_file("identity.frag"); } - bool needs_texture_bounce() const { return true; } - AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; } + string effect_type_id() const override { return "IdentityEffect"; } + string output_fragment_shader() override { return read_file("identity.frag"); } + bool needs_texture_bounce() const override { return true; } + AlphaHandling alpha_handling() const override { return DONT_CARE_ALPHA_TYPE; } }; TEST(EffectChainTest, TextureBouncePreservesIdentity) { @@ -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); @@ -122,12 +140,12 @@ TEST(EffectChainTest, TopLeftOrigin) { class InvertEffect : public Effect { public: InvertEffect() {} - virtual string effect_type_id() const { return "InvertEffect"; } - string output_fragment_shader() { return read_file("invert_effect.frag"); } + string effect_type_id() const override { return "InvertEffect"; } + string output_fragment_shader() override { return read_file("invert_effect.frag"); } // A real invert would actually care about its alpha, // but in this unit test, it only complicates things. - virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; } + AlphaHandling alpha_handling() const override { return DONT_CARE_ALPHA_TYPE; } }; // Like IdentityEffect, but rewrites itself out of the loop, @@ -137,9 +155,9 @@ template class RewritingEffect : public Effect { public: RewritingEffect() : effect(new T()), replaced_node(nullptr) {} - virtual string effect_type_id() const { return "RewritingEffect[" + effect->effect_type_id() + "]"; } - string output_fragment_shader() { EXPECT_TRUE(false); return read_file("identity.frag"); } - virtual void rewrite_graph(EffectChain *graph, Node *self) { + string effect_type_id() const override { return "RewritingEffect[" + effect->effect_type_id() + "]"; } + string output_fragment_shader() override { EXPECT_TRUE(false); return read_file("identity.frag"); } + void rewrite_graph(EffectChain *graph, Node *self) override { replaced_node = graph->add_node(effect); graph->replace_receiver(self, replaced_node); graph->replace_sender(self, replaced_node); @@ -166,8 +184,8 @@ TEST(EffectChainTest, RewritingWorksAndGammaConversionsAreInserted) { tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB); Node *node = effect->replaced_node; - ASSERT_EQ(1, node->incoming_links.size()); - ASSERT_EQ(1, node->outgoing_links.size()); + ASSERT_EQ(1u, node->incoming_links.size()); + ASSERT_EQ(1u, node->outgoing_links.size()); EXPECT_EQ("GammaExpansionEffect", node->incoming_links[0]->effect->effect_type_id()); EXPECT_EQ("GammaCompressionEffect", node->outgoing_links[0]->effect->effect_type_id()); @@ -195,8 +213,8 @@ TEST(EffectChainTest, RewritingWorksAndTexturesAreAskedForsRGB) { tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB); Node *node = effect->replaced_node; - ASSERT_EQ(1, node->incoming_links.size()); - ASSERT_EQ(1, node->outgoing_links.size()); + ASSERT_EQ(1u, node->incoming_links.size()); + ASSERT_EQ(1u, node->outgoing_links.size()); EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id()); EXPECT_EQ("GammaCompressionEffect", node->outgoing_links[0]->effect->effect_type_id()); @@ -219,8 +237,8 @@ TEST(EffectChainTest, RewritingWorksAndColorspaceConversionsAreInserted) { tester.run(out_data, GL_RED, COLORSPACE_REC_601_525, GAMMA_LINEAR); Node *node = effect->replaced_node; - ASSERT_EQ(1, node->incoming_links.size()); - ASSERT_EQ(1, node->outgoing_links.size()); + ASSERT_EQ(1u, node->incoming_links.size()); + ASSERT_EQ(1u, node->outgoing_links.size()); EXPECT_EQ("ColorspaceConversionEffect", node->incoming_links[0]->effect->effect_type_id()); EXPECT_EQ("ColorspaceConversionEffect", node->outgoing_links[0]->effect->effect_type_id()); @@ -235,7 +253,7 @@ public: : FlatInput(format, pixel_format, type, width, height), overridden_color_space(format.color_space), overridden_gamma_curve(format.gamma_curve) {} - virtual string effect_type_id() const { return "UnknownColorspaceInput"; } + string effect_type_id() const override { return "UnknownColorspaceInput"; } void set_color_space(Colorspace colorspace) { overridden_color_space = colorspace; @@ -243,8 +261,8 @@ public: void set_gamma_curve(GammaCurve gamma_curve) { overridden_gamma_curve = gamma_curve; } - Colorspace get_color_space() const { return overridden_color_space; } - GammaCurve get_gamma_curve() const { return overridden_gamma_curve; } + Colorspace get_color_space() const override { return overridden_color_space; } + GammaCurve get_gamma_curve() const override { return overridden_gamma_curve; } private: Colorspace overridden_color_space; @@ -298,8 +316,8 @@ TEST(EffectChainTest, NoGammaConversionsWhenLinearLightNotNeeded) { tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB); Node *node = effect->replaced_node; - ASSERT_EQ(1, node->incoming_links.size()); - EXPECT_EQ(0, node->outgoing_links.size()); + ASSERT_EQ(1u, node->incoming_links.size()); + EXPECT_EQ(0u, node->outgoing_links.size()); EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id()); expect_equal(expected_data, out_data, 3, 2); @@ -321,8 +339,8 @@ TEST(EffectChainTest, NoColorspaceConversionsWhensRGBPrimariesNotNeeded) { tester.run(out_data, GL_RED, COLORSPACE_REC_601_525, GAMMA_LINEAR); Node *node = effect->replaced_node; - ASSERT_EQ(1, node->incoming_links.size()); - EXPECT_EQ(0, node->outgoing_links.size()); + ASSERT_EQ(1u, node->incoming_links.size()); + EXPECT_EQ(0u, node->outgoing_links.size()); EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id()); expect_equal(expected_data, out_data, 3, 2); @@ -409,8 +427,8 @@ TEST(EffectChainTest, NoAlphaConversionsWhenPremultipliedAlphaNotNeeded) { tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR); Node *node = effect->replaced_node; - ASSERT_EQ(1, node->incoming_links.size()); - EXPECT_EQ(0, node->outgoing_links.size()); + ASSERT_EQ(1u, node->incoming_links.size()); + EXPECT_EQ(0u, node->outgoing_links.size()); EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id()); expect_equal(expected_data, out_data, 4, size); @@ -420,15 +438,14 @@ TEST(EffectChainTest, NoAlphaConversionsWhenPremultipliedAlphaNotNeeded) { class BlueInput : public Input { public: BlueInput() { register_int("needs_mipmaps", &needs_mipmaps); } - virtual string effect_type_id() const { return "IdentityEffect"; } - string output_fragment_shader() { return read_file("blue.frag"); } - virtual AlphaHandling alpha_handling() const { return OUTPUT_BLANK_ALPHA; } - virtual void finalize() {} - virtual bool can_output_linear_gamma() const { return true; } - virtual unsigned get_width() const { return 1; } - virtual unsigned get_height() const { return 1; } - virtual Colorspace get_color_space() const { return COLORSPACE_sRGB; } - virtual GammaCurve get_gamma_curve() const { return GAMMA_LINEAR; } + string effect_type_id() const override { return "IdentityEffect"; } + string output_fragment_shader() override { return read_file("blue.frag"); } + AlphaHandling alpha_handling() const override { return OUTPUT_BLANK_ALPHA; } + bool can_output_linear_gamma() const override { return true; } + unsigned get_width() const override { return 1; } + unsigned get_height() const override { return 1; } + Colorspace get_color_space() const override { return COLORSPACE_sRGB; } + GammaCurve get_gamma_curve() const override { return GAMMA_LINEAR; } private: int needs_mipmaps; @@ -439,9 +456,9 @@ private: class RewritingToBlueInput : public Input { public: RewritingToBlueInput() : blue_node(nullptr) { register_int("needs_mipmaps", &needs_mipmaps); } - virtual string effect_type_id() const { return "RewritingToBlueInput"; } - string output_fragment_shader() { EXPECT_TRUE(false); return read_file("identity.frag"); } - virtual void rewrite_graph(EffectChain *graph, Node *self) { + string effect_type_id() const override { return "RewritingToBlueInput"; } + string output_fragment_shader() override { EXPECT_TRUE(false); return read_file("identity.frag"); } + void rewrite_graph(EffectChain *graph, Node *self) override { Node *blue_node = graph->add_node(new BlueInput()); graph->replace_receiver(self, blue_node); graph->replace_sender(self, blue_node); @@ -452,13 +469,12 @@ public: // Dummy values that we need to implement because we inherit from Input. // Same as BlueInput. - virtual AlphaHandling alpha_handling() const { return OUTPUT_BLANK_ALPHA; } - virtual void finalize() {} - virtual bool can_output_linear_gamma() const { return true; } - virtual unsigned get_width() const { return 1; } - virtual unsigned get_height() const { return 1; } - virtual Colorspace get_color_space() const { return COLORSPACE_sRGB; } - virtual GammaCurve get_gamma_curve() const { return GAMMA_LINEAR; } + AlphaHandling alpha_handling() const override { return OUTPUT_BLANK_ALPHA; } + bool can_output_linear_gamma() const override { return true; } + unsigned get_width() const override { return 1; } + unsigned get_height() const override { return 1; } + Colorspace get_color_space() const override { return COLORSPACE_sRGB; } + GammaCurve get_gamma_curve() const override { return GAMMA_LINEAR; } Node *blue_node; @@ -480,8 +496,8 @@ TEST(EffectChainTest, NoAlphaConversionsWithBlankAlpha) { tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_PREMULTIPLIED); Node *node = input->blue_node; - EXPECT_EQ(0, node->incoming_links.size()); - EXPECT_EQ(0, node->outgoing_links.size()); + EXPECT_EQ(0u, node->incoming_links.size()); + EXPECT_EQ(0u, node->outgoing_links.size()); expect_equal(data, out_data, 4, size); } @@ -490,9 +506,9 @@ TEST(EffectChainTest, NoAlphaConversionsWithBlankAlpha) { class BlankAlphaPreservingEffect : public Effect { public: BlankAlphaPreservingEffect() {} - virtual string effect_type_id() const { return "BlankAlphaPreservingEffect"; } - string output_fragment_shader() { return read_file("identity.frag"); } - virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; } + string effect_type_id() const override { return "BlankAlphaPreservingEffect"; } + string output_fragment_shader() override { return read_file("identity.frag"); } + AlphaHandling alpha_handling() const override { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; } }; TEST(EffectChainTest, NoAlphaConversionsWithBlankAlphaPreservingEffect) { @@ -511,8 +527,8 @@ TEST(EffectChainTest, NoAlphaConversionsWithBlankAlphaPreservingEffect) { tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); Node *node = effect->replaced_node; - EXPECT_EQ(1, node->incoming_links.size()); - EXPECT_EQ(0, node->outgoing_links.size()); + EXPECT_EQ(1u, node->incoming_links.size()); + EXPECT_EQ(0u, node->outgoing_links.size()); expect_equal(data, out_data, 4, size); } @@ -537,8 +553,8 @@ TEST(EffectChainTest, AlphaConversionsWithNonBlankAlphaPreservingEffect) { tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED); Node *node = effect->replaced_node; - EXPECT_EQ(1, node->incoming_links.size()); - EXPECT_EQ(1, node->outgoing_links.size()); + EXPECT_EQ(1u, node->incoming_links.size()); + EXPECT_EQ(1u, node->outgoing_links.size()); EXPECT_EQ("AlphaDivisionEffect", node->outgoing_links[0]->effect->effect_type_id()); expect_equal(data, out_data, 4, size); @@ -549,16 +565,16 @@ TEST(EffectChainTest, AlphaConversionsWithNonBlankAlphaPreservingEffect) { class MipmapNeedingEffect : public Effect { public: MipmapNeedingEffect() {} - virtual bool needs_mipmaps() const { return true; } + bool needs_mipmaps() const override { return true; } // To be allowed to mess with the sampler state. - virtual bool needs_texture_bounce() const { return true; } + bool needs_texture_bounce() const override { return true; } - virtual string effect_type_id() const { return "MipmapNeedingEffect"; } - string output_fragment_shader() { return read_file("mipmap_needing_effect.frag"); } - virtual void inform_added(EffectChain *chain) { this->chain = chain; } + string effect_type_id() const override { return "MipmapNeedingEffect"; } + string output_fragment_shader() override { return read_file("mipmap_needing_effect.frag"); } + void inform_added(EffectChain *chain) override { this->chain = chain; } - void set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num) + void set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num) override { Node *self = chain->find_node_for_effect(this); glActiveTexture(chain->get_input_sampler(self, 0)); @@ -629,8 +645,8 @@ public: NonMipmapCapableInput(ImageFormat format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height) : FlatInput(format, pixel_format, type, width, height) {} - virtual bool can_supply_mipmaps() const { return false; } - bool set_int(const std::string& key, int value) { + bool can_supply_mipmaps() const override { return false; } + bool set_int(const std::string& key, int value) override { if (key == "needs_mipmaps") { assert(value == 0); } @@ -761,10 +777,10 @@ TEST(EffectChainTest, ResizeDownByFourThenUpByFour) { class AddEffect : public Effect { public: AddEffect() {} - virtual string effect_type_id() const { return "AddEffect"; } - string output_fragment_shader() { return read_file("add.frag"); } - virtual unsigned num_inputs() const { return 2; } - virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; } + string effect_type_id() const override { return "AddEffect"; } + string output_fragment_shader() override { return read_file("add.frag"); } + unsigned num_inputs() const override { return 2; } + AlphaHandling alpha_handling() const override { return DONT_CARE_ALPHA_TYPE; } }; // Constructs the graph @@ -893,8 +909,8 @@ TEST(EffectChainTest, EffectUsedTwiceOnlyGetsOneGammaConversion) { expect_equal(expected_data, out_data, 2, 2); Node *node = effect->replaced_node; - ASSERT_EQ(1, node->incoming_links.size()); - ASSERT_EQ(1, node->outgoing_links.size()); + ASSERT_EQ(1u, node->incoming_links.size()); + ASSERT_EQ(1u, node->outgoing_links.size()); EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id()); EXPECT_EQ("GammaExpansionEffect", node->outgoing_links[0]->effect->effect_type_id()); } @@ -926,8 +942,8 @@ TEST(EffectChainTest, EffectUsedTwiceOnlyGetsOneColorspaceConversion) { expect_equal(expected_data, out_data, 2, 2); Node *node = effect->replaced_node; - ASSERT_EQ(1, node->incoming_links.size()); - ASSERT_EQ(1, node->outgoing_links.size()); + ASSERT_EQ(1u, node->incoming_links.size()); + ASSERT_EQ(1u, node->outgoing_links.size()); EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id()); EXPECT_EQ("ColorspaceConversionEffect", node->outgoing_links[0]->effect->effect_type_id()); } @@ -937,12 +953,12 @@ TEST(EffectChainTest, EffectUsedTwiceOnlyGetsOneColorspaceConversion) { class SizeStoringEffect : public BouncingIdentityEffect { public: SizeStoringEffect() : input_width(-1), input_height(-1) {} - virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) { + void inform_input_size(unsigned input_num, unsigned width, unsigned height) override { assert(input_num == 0); input_width = width; input_height = height; } - virtual string effect_type_id() const { return "SizeStoringEffect"; } + string effect_type_id() const override { return "SizeStoringEffect"; } int input_width, input_height; }; @@ -1063,13 +1079,13 @@ public: height(height), virtual_width(virtual_width), virtual_height(virtual_height) {} - virtual string effect_type_id() const { return "VirtualResizeEffect"; } - string output_fragment_shader() { return read_file("identity.frag"); } + string effect_type_id() const override { return "VirtualResizeEffect"; } + string output_fragment_shader() override { return read_file("identity.frag"); } - virtual bool changes_output_size() const { return true; } + bool changes_output_size() const override { return true; } - virtual void get_output_size(unsigned *width, unsigned *height, - unsigned *virtual_width, unsigned *virtual_height) const { + void get_output_size(unsigned *width, unsigned *height, + unsigned *virtual_width, unsigned *virtual_height) const override { *width = this->width; *height = this->height; *virtual_width = this->virtual_width; @@ -1111,20 +1127,20 @@ class NonVirtualResizeEffect : public VirtualResizeEffect { public: NonVirtualResizeEffect(int width, int height) : VirtualResizeEffect(width, height, width, height) {} - virtual string effect_type_id() const { return "NonVirtualResizeEffect"; } - virtual bool sets_virtual_output_size() const { return false; } + string effect_type_id() const override { return "NonVirtualResizeEffect"; } + bool sets_virtual_output_size() const override { return false; } }; // An effect that promises one-to-one sampling (unlike IdentityEffect). class OneToOneEffect : public Effect { public: OneToOneEffect() {} - virtual string effect_type_id() const { return "OneToOneEffect"; } - string output_fragment_shader() { return read_file("identity.frag"); } - virtual bool one_to_one_sampling() const { return true; } + string effect_type_id() const override { return "OneToOneEffect"; } + string output_fragment_shader() override { return read_file("identity.frag"); } + 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, @@ -1137,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); @@ -1145,7 +1165,7 @@ TEST(EffectChainTest, NoBounceWithOneToOneSampling) { expect_equal(data, out_data, size, size); // The first OneToOneEffect should be in the same phase as its input. - ASSERT_EQ(1, effect1->replaced_node->incoming_links.size()); + ASSERT_EQ(1u, effect1->replaced_node->incoming_links.size()); EXPECT_EQ(effect1->replaced_node->incoming_links[0]->containing_phase, effect1->replaced_node->containing_phase); @@ -1182,7 +1202,7 @@ TEST(EffectChainTest, BounceWhenOneToOneIsBroken) { // the IdentityEffect (since the latter is not one-to-one), // ie., the chain should be broken somewhere between them, but exactly // where doesn't matter. - ASSERT_EQ(1, effect1->replaced_node->incoming_links.size()); + ASSERT_EQ(1u, effect1->replaced_node->incoming_links.size()); EXPECT_NE(effect1->replaced_node->incoming_links[0]->containing_phase, effect3->replaced_node->containing_phase); @@ -1208,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; @@ -1256,15 +1277,15 @@ 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. class PrintfingBlueEffect : public Effect { public: PrintfingBlueEffect() {} - virtual string effect_type_id() const { return "PrintfingBlueEffect"; } - string output_fragment_shader() { + string effect_type_id() const override { return "PrintfingBlueEffect"; } + string output_fragment_shader() override { stringstream ss; ss.imbue(locale("C")); ss.precision(8); @@ -1328,19 +1349,19 @@ TEST(EffectChainTest, sRGBIntermediate) { class PassThroughEffect : public IdentityEffect { public: PassThroughEffect() {} - virtual string effect_type_id() const { return "PassThroughEffect"; } - virtual bool needs_linear_light() const { return false; } - AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; } + string effect_type_id() const override { return "PassThroughEffect"; } + bool needs_linear_light() const override { return false; } + AlphaHandling alpha_handling() const override { return DONT_CARE_ALPHA_TYPE; } }; // Same, just also bouncing. class BouncingPassThroughEffect : public BouncingIdentityEffect { public: BouncingPassThroughEffect() {} - virtual string effect_type_id() const { return "BouncingPassThroughEffect"; } - virtual bool needs_linear_light() const { return false; } - bool needs_texture_bounce() const { return true; } - AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; } + string effect_type_id() const override { return "BouncingPassThroughEffect"; } + bool needs_linear_light() const override { return false; } + bool needs_texture_bounce() const override { return true; } + AlphaHandling alpha_handling() const override { return DONT_CARE_ALPHA_TYPE; } }; TEST(EffectChainTest, Linear10bitIntermediateAccuracy) { @@ -1371,7 +1392,7 @@ TEST(EffectChainTest, Linear10bitIntermediateAccuracy) { expect_equal(linear_data, out_data, size, 1, 7.5e-3, 2e-5); } -TEST(EffectChainTest, SquareRoot10bitIntermediateAccuracy) { +TEST_P(WithAndWithoutComputeShaderTest, SquareRoot10bitIntermediateAccuracy) { // Note that we do the comparison in sRGB space, which is what we // typically would want; however, we do the sRGB conversion ourself // to avoid compounding errors from shader conversions into the @@ -1386,7 +1407,11 @@ TEST(EffectChainTest, SquareRoot10bitIntermediateAccuracy) { EffectChainTester tester(data, size, 1, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_LINEAR, GL_RGBA32F); tester.get_chain()->set_intermediate_format(GL_RGB10_A2, SQUARE_ROOT_FRAMEBUFFER_TRANSFORMATION); - tester.get_chain()->add_effect(new IdentityEffect()); + if (GetParam() == "compute") { + tester.get_chain()->add_effect(new IdentityComputeEffect()); + } else { + tester.get_chain()->add_effect(new IdentityEffect()); + } tester.get_chain()->add_effect(new BouncingIdentityEffect()); tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR); @@ -1424,11 +1449,11 @@ TEST(EffectChainTest, SquareRootIntermediateIsTurnedOffForNonLinearData) { class RecordingIdentityEffect : public Effect { public: RecordingIdentityEffect() {} - virtual string effect_type_id() const { return "RecordingIdentityEffect"; } - string output_fragment_shader() { return read_file("identity.frag"); } + string effect_type_id() const override { return "RecordingIdentityEffect"; } + string output_fragment_shader() override { return read_file("identity.frag"); } GLuint last_glsl_program_num; - void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num) + void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num) override { last_glsl_program_num = glsl_program_num; } @@ -1447,7 +1472,7 @@ TEST(EffectChainTest, ProgramsAreClonedForMultipleThreads) { expect_equal(data, out_data, 3, 2); - ASSERT_NE(0, effect->last_glsl_program_num); + ASSERT_NE(0u, effect->last_glsl_program_num); // Now pretend some other effect is using this program number; // ResourcePool will then need to clone it. @@ -1467,15 +1492,6 @@ TEST(EffectChainTest, ProgramsAreClonedForMultipleThreads) { expect_equal(data, out_data, 3, 2); } -// 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(ComputeShaderTest, Identity) { float data[] = { 0.0f, 0.25f, 0.3f, @@ -1535,4 +1551,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(2u, phase->output_width); + EXPECT_EQ(1u, phase->output_height); +} + } // namespace movit