X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=dd4ffa2254835978c77b7243a563867fd07a9411;hp=aabcc33fe4dddf8b5c321f5f535bce8bd900beb2;hb=d88ed3150376693000665b9016c0350d5d90e9e1;hpb=daca930fb2f404e8800c35715f1fc5c4897d19fb

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index aabcc33..dd4ffa2 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -2,6 +2,10 @@
 //
 // Note that this also contains the tests for some of the simpler effects.
 
+#include <locale>
+#include <sstream>
+#include <string>
+
 #include <epoxy/gl.h>
 #include <assert.h>
 
@@ -152,19 +156,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 +180,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 +231,7 @@ private:
 	GammaCurve overridden_gamma_curve;
 };
 
-TEST(EffectChainTester, HandlesInputChangingColorspace) {
+TEST(EffectChainTest, HandlesInputChangingColorspace) {
 	const int size = 4;
 
 	float data[size] = {
@@ -983,7 +991,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;
@@ -1002,7 +1010,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);
@@ -1024,7 +1032,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);
 
@@ -1032,4 +1045,45 @@ TEST(EffectChainTest, IdentityWithOwnPool) {
 	movit_debug_level = MOVIT_DEBUG_OFF;
 }
 
+// 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() {
+		stringstream ss;
+		ss.imbue(locale("C"));
+		ss.precision(8);
+		ss << "vec4 FUNCNAME(vec2 tc) { return vec4("
+		   << 0.0f << ", " << 0.0f << ", "
+		   << 0.5f << ", " << 1.0f << "); }\n";
+		return ss.str();
+	}
+};
+
+TEST(EffectChainTest, StringStreamLocalesWork) {
+	// An example of a locale with comma instead of period as decimal separator.
+	// Obviously, if you run on a machine without this locale available,
+	// the test will always succeed. Note that the OpenGL driver might call
+	// setlocale() behind-the-scenes, and that might corrupt the returned
+	// pointer, so we need to take our own copy of it here.
+	char *saved_locale = strdup(setlocale(LC_ALL, "nb_NO.UTF_8"));
+	float data[] = {
+		0.0f, 0.0f, 0.0f, 0.0f,
+	};
+	float expected_data[] = {
+		0.0f, 0.0f, 0.5f, 1.0f,
+	};
+	float out_data[4];
+	EffectChainTester tester(data, 1, 1, FORMAT_RGBA_PREMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.get_chain()->add_effect(new PrintfingBlueEffect());
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, 4, 1);
+
+	setlocale(LC_ALL, saved_locale);
+	free(saved_locale);
+}
+
+
 }  // namespace movit