X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=c64c7b55311e25c81c333875015fa9e1ca6e3cc2;hp=49d431b98db0a067e01076ae5e2f1fcd0550c82c;hb=1514db1d0f3963dbc18177d2fd7eaae16a069c3b;hpb=37f56fcbe571b2322243f6de59494bf9e0cbb37a

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index 49d431b..c64c7b5 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -4,7 +4,6 @@
 
 #include <GL/glew.h>
 #include <assert.h>
-#include <stddef.h>
 
 #include "effect.h"
 #include "effect_chain.h"
@@ -12,6 +11,7 @@
 #include "gtest/gtest.h"
 #include "input.h"
 #include "mirror_effect.h"
+#include "multiply_effect.h"
 #include "resize_effect.h"
 #include "test_util.h"
 #include "util.h"
@@ -639,18 +639,6 @@ TEST(EffectChainTest, ResizeDownByFourThenUpByFour) {
 	expect_equal(expected_data, out_data, 4, 16);
 }
 
-// An effect that multiplies with a constant. Used below.
-class MultiplyEffect : public Effect {
-public:
-	MultiplyEffect() { register_float("factor", &factor); }
-	virtual std::string effect_type_id() const { return "MultiplyEffect"; }
-	std::string output_fragment_shader() { return read_file("multiply.frag"); }
-	virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }
-
-private:
-	float factor;
-};
-
 // An effect that adds its two inputs together. Used below.
 class AddEffect : public Effect {
 public:
@@ -681,11 +669,14 @@ TEST(EffectChainTest, DiamondGraph) {
 	};
 	float out_data[2 * 2];
 
+	const float half[] = { 0.5f, 0.5f, 0.5f, 0.5f };
+	const float two[] = { 2.0f, 2.0f, 2.0f, 0.5f };
+
 	MultiplyEffect *mul_half = new MultiplyEffect();
-	ASSERT_TRUE(mul_half->set_float("factor", 0.5f));
+	ASSERT_TRUE(mul_half->set_vec4("factor", half));
 	
 	MultiplyEffect *mul_two = new MultiplyEffect();
-	ASSERT_TRUE(mul_two->set_float("factor", 2.0f));
+	ASSERT_TRUE(mul_two->set_vec4("factor", two));
 
 	EffectChainTester tester(NULL, 2, 2);
 
@@ -727,11 +718,14 @@ TEST(EffectChainTest, DiamondGraphWithOneInputUsedInTwoPhases) {
 	};
 	float out_data[2 * 2];
 
+	const float half[] = { 0.5f, 0.5f, 0.5f, 0.5f };
+	const float two[] = { 2.0f, 2.0f, 2.0f, 0.5f };
+
 	MultiplyEffect *mul_half = new MultiplyEffect();
-	ASSERT_TRUE(mul_half->set_float("factor", 0.5f));
+	ASSERT_TRUE(mul_half->set_vec4("factor", half));
 	
 	MultiplyEffect *mul_two = new MultiplyEffect();
-	ASSERT_TRUE(mul_two->set_float("factor", 2.0f));
+	ASSERT_TRUE(mul_two->set_vec4("factor", two));
 	
 	BouncingIdentityEffect *bounce = new BouncingIdentityEffect();
 
@@ -960,3 +954,69 @@ TEST(EffectChainTest, VirtualSizeIsSentOnToInputs) {
 	// since bilinear scaling from 2x2 → 3x3 → 2x2 is not very exact.
 	expect_equal(data, out_data, size, size);
 }
+
+extern bool movit_initialized;
+
+// Does not use EffectChainTest, so that it can construct an EffectChain without
+// a shared ResourcePool (which is also properly destroyed afterwards).
+// Also turns on debugging to test that code path.
+TEST(EffectChainTest, IdentityWithOwnPool) {
+	const int width = 3, height = 2;
+	float data[] = {
+		0.0f, 0.25f, 0.3f,
+		0.75f, 1.0f, 1.0f,
+	};
+	const float expected_data[] = {
+		0.75f, 1.0f, 1.0f,
+		0.0f, 0.25f, 0.3f,
+	};
+	float out_data[6];
+
+	EffectChain chain(width, height);
+	movit_initialized = false;
+	init_movit(".", MOVIT_DEBUG_ON);
+
+	ImageFormat format;
+	format.color_space = COLORSPACE_sRGB;
+	format.gamma_curve = GAMMA_LINEAR;
+
+	FlatInput *input = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, width, height);
+	input->set_pixel_data(data);
+	chain.add_input(input);
+	chain.add_output(format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
+
+	GLuint texnum, fbo;
+	glGenTextures(1, &texnum);
+	check_error();
+	glBindTexture(GL_TEXTURE_2D, texnum);
+	check_error();
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+	check_error();
+
+	glGenFramebuffers(1, &fbo);
+	check_error();
+	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+	check_error();
+	glFramebufferTexture2D(
+		GL_FRAMEBUFFER,
+		GL_COLOR_ATTACHMENT0,
+		GL_TEXTURE_2D,
+		texnum,
+		0);
+	check_error();
+	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	check_error();
+
+	chain.finalize();
+
+	chain.render_to_fbo(fbo, width, height);
+
+	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
+	glReadPixels(0, 0, width, height, GL_RED, GL_FLOAT, out_data);
+
+	expect_equal(expected_data, out_data, width, height);
+
+	// Reset the debug status again.
+	movit_initialized = false;
+	init_movit(".", MOVIT_DEBUG_OFF);
+}