X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=21cb2bec6538189d5cfd9bc7b009a014b9e271bf;hp=5df9270f3b09d48c344bda1569b84895d92478ab;hb=29072985d0a00a53e5b578a1444cee61a0c9e1f2;hpb=898a2140fa78eecb3552f63f021c608b239f969c

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index 5df9270..21cb2be 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -2,12 +2,13 @@
 //
 // Note that this also contains the tests for some of the simpler effects.
 
+#include <GL/glew.h>
+
 #include "effect_chain.h"
 #include "flat_input.h"
 #include "gtest/gtest.h"
 #include "mirror_effect.h"
 #include "resize_effect.h"
-#include "opengl.h"
 #include "test_util.h"
 
 TEST(EffectChainTest, EmptyChain) {
@@ -135,6 +136,31 @@ TEST(EffectChainTest, RewritingWorksAndGammaConversionsAreInserted) {
 	expect_equal(expected_data, out_data, 3, 2);
 }
 
+TEST(EffectChainTest, RewritingWorksAndTexturesAreAskedForsRGB) {
+	unsigned char data[] = {
+		0, 64,
+		128, 255,
+	};
+	float expected_data[4] = {
+		1.0f, 0.9771f,
+		0.8983f, 0.0f,
+	};
+	float out_data[2];
+	EffectChainTester tester(NULL, 2, 2);
+	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_sRGB);
+	RewritingToInvertEffect *effect = new RewritingToInvertEffect();
+	tester.get_chain()->add_effect(effect);
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB);
+
+	Node *node = effect->invert_node;
+	ASSERT_EQ(1, node->incoming_links.size());
+	ASSERT_EQ(1, 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());
+
+	expect_equal(expected_data, out_data, 2, 2);
+}
+
 TEST(EffectChainTest, RewritingWorksAndColorspaceConversionsAreInserted) {
 	float data[] = {
 		0.0f, 0.25f, 0.3f,
@@ -153,8 +179,8 @@ TEST(EffectChainTest, RewritingWorksAndColorspaceConversionsAreInserted) {
 	Node *node = effect->invert_node;
 	ASSERT_EQ(1, node->incoming_links.size());
 	ASSERT_EQ(1, 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());
+	EXPECT_EQ("ColorspaceConversionEffect", node->incoming_links[0]->effect->effect_type_id());
+	EXPECT_EQ("ColorspaceConversionEffect", node->outgoing_links[0]->effect->effect_type_id());
 
 	expect_equal(expected_data, out_data, 3, 2);
 }
@@ -239,6 +265,23 @@ TEST(EffectChainTest, IdentityThroughsRGBConversions) {
 	expect_equal(data, out_data, 256, 1);
 }
 
+// Same, but uses the forward sRGB table from the GPU.
+TEST(EffectChainTest, IdentityThroughGPUsRGBConversions) {
+	unsigned char data[256];
+	float expected_data[256];
+	for (unsigned i = 0; i < 256; ++i) {
+		data[i] = i;
+		expected_data[i] = i / 255.0;
+	};
+	float out_data[256];
+	EffectChainTester tester(NULL, 256, 1);
+	tester.add_input(data, FORMAT_GRAYSCALE, COLORSPACE_sRGB, GAMMA_sRGB);
+	tester.get_chain()->add_effect(new IdentityEffect());
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_sRGB);
+
+	expect_equal(expected_data, out_data, 256, 1);
+}
+
 // Same, for the Rec. 601/709 gamma curve.
 TEST(EffectChainTest, IdentityThroughRec709) {
 	float data[256];