X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=516dd54ea00e84eaeaac7e2afd2e58b1f545343e;hp=7b86d1601467f8e302763898aaf3b8bfc9d4f268;hb=ba60914d4e5eda7b28af700bf43e9699b7aa720d;hpb=401c6ca91cf582904cf38d6bfe1d82a073eff559

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index 7b86d16..516dd54 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>
 
@@ -600,6 +604,81 @@ TEST(EffectChainTest, MipmapGenerationWorks) {
 	expect_equal(expected_data, out_data, 4, 16);
 }
 
+class NonMipmapCapableInput : public FlatInput {
+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) {
+		if (key == "needs_mipmaps") {
+			assert(value == 0);
+		}
+		return FlatInput::set_int(key, value);
+	}
+};
+
+// The same test as MipmapGenerationWorks, but with an input that refuses
+// to supply mipmaps.
+TEST(EffectChainTest, MipmapsWithNonMipmapCapableInput) {
+	float data[] = {  // In 4x4 blocks.
+		1.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 1.0f,
+
+		0.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 0.5f, 0.0f, 0.0f,
+		0.0f, 0.0f, 1.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 0.0f,
+
+		1.0f, 1.0f, 1.0f, 1.0f,
+		1.0f, 1.0f, 1.0f, 1.0f,
+		1.0f, 1.0f, 1.0f, 1.0f,
+		1.0f, 1.0f, 1.0f, 1.0f,
+
+		0.0f, 0.0f, 0.0f, 0.0f,
+		0.0f, 1.0f, 1.0f, 0.0f,
+		0.0f, 1.0f, 1.0f, 0.0f,
+		0.0f, 0.0f, 0.0f, 0.0f,
+	};
+	float expected_data[] = {  // Repeated four times each way.
+		0.125f,   0.125f,   0.125f,   0.125f,
+		0.09375f, 0.09375f, 0.09375f, 0.09375f,
+		1.0f,     1.0f,     1.0f,     1.0f,
+		0.25f,    0.25f,    0.25f,    0.25f,
+
+		0.125f,   0.125f,   0.125f,   0.125f,
+		0.09375f, 0.09375f, 0.09375f, 0.09375f,
+		1.0f,     1.0f,     1.0f,     1.0f,
+		0.25f,    0.25f,    0.25f,    0.25f,
+
+		0.125f,   0.125f,   0.125f,   0.125f,
+		0.09375f, 0.09375f, 0.09375f, 0.09375f,
+		1.0f,     1.0f,     1.0f,     1.0f,
+		0.25f,    0.25f,    0.25f,    0.25f,
+
+		0.125f,   0.125f,   0.125f,   0.125f,
+		0.09375f, 0.09375f, 0.09375f, 0.09375f,
+		1.0f,     1.0f,     1.0f,     1.0f,
+		0.25f,    0.25f,    0.25f,    0.25f,
+	};
+	float out_data[4 * 16];
+	EffectChainTester tester(NULL, 4, 16, FORMAT_GRAYSCALE);
+
+	ImageFormat format;
+	format.color_space = COLORSPACE_sRGB;
+	format.gamma_curve = GAMMA_LINEAR;
+
+	NonMipmapCapableInput *input = new NonMipmapCapableInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 16);
+	input->set_pixel_data(data);
+	tester.get_chain()->add_input(input);
+	tester.get_chain()->add_effect(new MipmapNeedingEffect());
+	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
+
+	expect_equal(expected_data, out_data, 4, 16);
+}
+
 TEST(EffectChainTest, ResizeDownByFourThenUpByFour) {
 	float data[] = {  // In 4x4 blocks.
 		1.0f, 0.0f, 0.0f, 0.0f,
@@ -1047,14 +1126,17 @@ public:
 	PrintfingBlueEffect() {}
 	virtual string effect_type_id() const { return "PrintfingBlueEffect"; }
 	string output_fragment_shader() {
-		char buf[256];
-		snprintf(buf, sizeof(buf), "vec4 FUNCNAME(vec2 tc) { return vec4(%f, %f, %f, %f); }\n",
-			0.0f, 0.0f, 1.0f, 1.0f);
-		return buf;
+		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, LocaleIsIgnoredDuringFinalize) {
+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
@@ -1065,7 +1147,7 @@ TEST(EffectChainTest, LocaleIsIgnoredDuringFinalize) {
 		0.0f, 0.0f, 0.0f, 0.0f,
 	};
 	float expected_data[] = {
-		0.0f, 0.0f, 1.0f, 1.0f,
+		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);
@@ -1078,4 +1160,5 @@ TEST(EffectChainTest, LocaleIsIgnoredDuringFinalize) {
 	free(saved_locale);
 }
 
+
 }  // namespace movit