X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input_test.cpp;h=397cae3c26d788f7abe5ed10ba064f23b60d2cbd;hp=b717764dda03bb136ff7cb3ece897fa04f3c2f43;hb=67b2debafd624d3be66588171d6ec677b54247ba;hpb=36ae69017f10987948009bf6f602da5f94e4f780

diff --git a/flat_input_test.cpp b/flat_input_test.cpp
index b717764..397cae3 100644
--- a/flat_input_test.cpp
+++ b/flat_input_test.cpp
@@ -1,8 +1,15 @@
 // Unit tests for FlatInput.
 
-#include "test_util.h"
-#include "gtest/gtest.h"
+#include <epoxy/gl.h>
+#include <stddef.h>
+
+#include "effect_chain.h"
 #include "flat_input.h"
+#include "gtest/gtest.h"
+#include "test_util.h"
+#include "util.h"
+
+namespace movit {
 
 TEST(FlatInput, SimpleGrayscale) {
 	const int size = 4;
@@ -71,7 +78,7 @@ TEST(FlatInput, RGBA) {
 	};
 	float out_data[4 * size];
 
-	EffectChainTester tester(data, 1, size, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data, 1, size, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(expected_data, out_data, 4, size);
@@ -102,7 +109,7 @@ TEST(FlatInput, AlphaIsNotModifiedBySRGBConversion) {
 	float out_data[4 * size];
 
         EffectChainTester tester(NULL, 1, size);
-        tester.add_input(data, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_sRGB);
+        tester.add_input(data, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_sRGB);
 	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(expected_data, out_data, 4, size);
@@ -152,7 +159,7 @@ TEST(FlatInput, BGRA) {
 	};
 	float out_data[4 * size];
 
-	EffectChainTester tester(data, 1, size, FORMAT_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data, 1, size, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(expected_data, out_data, 4, size);
@@ -223,3 +230,41 @@ TEST(FlatInput, UpdatedData) {
 	tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR);
 	expect_equal(data, out_data, width, height);
 }
+
+TEST(FlatInput, PBO) {
+	const int width = 3;
+	const int height = 2;
+
+	float data[width * height] = {
+		0.0, 1.0, 0.5,
+		0.5, 0.5, 0.2,
+	};
+	float expected_data[4 * width * height] = {
+		0.0, 0.0, 0.0, 1.0,  1.0, 1.0, 1.0, 1.0,  0.5, 0.5, 0.5, 1.0,
+		0.5, 0.5, 0.5, 1.0,  0.5, 0.5, 0.5, 1.0,  0.2, 0.2, 0.2, 1.0,
+	};
+	float out_data[4 * width * height];
+
+	GLuint pbo;
+	glGenBuffers(1, &pbo);
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo);
+	glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, width * height * sizeof(float), data, GL_STREAM_DRAW);
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+
+	EffectChainTester tester(NULL, width, height);
+
+	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((float *)BUFFER_OFFSET(0), pbo);
+	tester.get_chain()->add_input(input);
+
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	expect_equal(expected_data, out_data, 4 * width, height);
+
+	glDeleteBuffers(1, &pbo);
+}
+
+}  // namespace movit