X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=50d004db1c52c1192946b87add1b785149f585fc;hp=67b3dfc56aa7567678624884818242b40b1d5487;hb=95edbfccb0843da3cc105dadc5bc6d8e102f6071;hpb=8ea03db1932e4a76f457e0ecdfe31a4c8be0e0eb

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index 67b3dfc..50d004d 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -152,19 +152,23 @@ TEST(EffectChainTest, RewritingWorksAndGammaConversionsAreInserted) {
 
 TEST(EffectChainTest, RewritingWorksAndTexturesAreAskedForsRGB) {
 	unsigned char data[] = {
-		0, 64,
-		128, 255,
+		  0,   0,   0, 255,
+		 64,  64,  64, 255,
+		128, 128, 128, 255,
+		255, 255, 255, 255,
 	};
-	float expected_data[4] = {
-		1.0f, 0.9771f,
-		0.8983f, 0.0f,
+	float expected_data[] = {
+		1.0000f, 1.0000f, 1.0000f, 1.0000f,
+		0.9771f, 0.9771f, 0.9771f, 1.0000f,
+		0.8983f, 0.8983f, 0.8983f, 1.0000f,
+		0.0000f, 0.0000f, 0.0000f, 1.0000f
 	};
-	float out_data[4];
-	EffectChainTester tester(NULL, 2, 2);
-	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_sRGB);
+	float out_data[4 * 4];
+	EffectChainTester tester(NULL, 1, 4);
+	tester.add_input(data, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_sRGB);
 	RewritingEffect<InvertEffect> *effect = new RewritingEffect<InvertEffect>();
 	tester.get_chain()->add_effect(effect);
-	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB);
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
 
 	Node *node = effect->replaced_node;
 	ASSERT_EQ(1, node->incoming_links.size());
@@ -172,7 +176,7 @@ TEST(EffectChainTest, RewritingWorksAndTexturesAreAskedForsRGB) {
 	EXPECT_EQ("FlatInput", node->incoming_links[0]->effect->effect_type_id());
 	EXPECT_EQ("GammaCompressionEffect", node->outgoing_links[0]->effect->effect_type_id());
 
-	expect_equal(expected_data, out_data, 2, 2);
+	expect_equal(expected_data, out_data, 4, 4);
 }
 
 TEST(EffectChainTest, RewritingWorksAndColorspaceConversionsAreInserted) {
@@ -223,7 +227,7 @@ private:
 	GammaCurve overridden_gamma_curve;
 };
 
-TEST(EffectChainTester, HandlesInputChangingColorspace) {
+TEST(EffectChainTest, HandlesInputChangingColorspace) {
 	const int size = 4;
 
 	float data[size] = {
@@ -522,17 +526,27 @@ class MipmapNeedingEffect : public Effect {
 public:
 	MipmapNeedingEffect() {}
 	virtual bool needs_mipmaps() const { return true; }
+
+	// To be allowed to mess with the sampler state.
+	virtual bool needs_texture_bounce() const { 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; }
+
 	void set_gl_state(GLuint glsl_program_num, const string& prefix, unsigned *sampler_num)
 	{
-		glActiveTexture(GL_TEXTURE0);
+		Node *self = chain->find_node_for_effect(this);
+		glActiveTexture(chain->get_input_sampler(self, 0));
 		check_error();
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
 		check_error();
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 		check_error();
 	}
+
+private:
+	EffectChain *chain;
 };
 
 TEST(EffectChainTest, MipmapGenerationWorks) {
@@ -973,7 +987,7 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
 		0.75f, 1.0f, 1.0f,
 		0.0f, 0.25f, 0.3f,
 	};
-	float out_data[6];
+	float out_data[6], temp[6 * 4];
 
 	EffectChain chain(width, height);
 	movit_debug_level = MOVIT_DEBUG_ON;
@@ -992,7 +1006,7 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
 	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);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, width, height, 0, GL_RGBA, GL_FLOAT, NULL);
 	check_error();
 
 	glGenFramebuffers(1, &fbo);
@@ -1014,7 +1028,12 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
 	chain.render_to_fbo(fbo, width, height);
 
 	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-	glReadPixels(0, 0, width, height, GL_RED, GL_FLOAT, out_data);
+	check_error();
+	glReadPixels(0, 0, width, height, GL_RGBA, GL_FLOAT, temp);
+	check_error();
+	for (unsigned i = 0; i < 6; ++i) {
+		out_data[i] = temp[i * 4];
+	}
 
 	expect_equal(expected_data, out_data, width, height);