X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=colorspace_conversion_effect_test.cpp;h=76bcd49aaa6272895b5c6d5e5f0ac6685f2bb488;hp=803773dfd6e4e2f67f8d20562c408df5f5d3aef0;hb=c5cd45a98c89b983f53fd8759c4e0a3cb286b96b;hpb=1ca4785183b5af9a2a255bba0a28dfdae156470a

diff --git a/colorspace_conversion_effect_test.cpp b/colorspace_conversion_effect_test.cpp
index 803773d..76bcd49 100644
--- a/colorspace_conversion_effect_test.cpp
+++ b/colorspace_conversion_effect_test.cpp
@@ -1,8 +1,10 @@
 // Unit tests for ColorspaceConversionEffect.
 
-#include "test_util.h"
-#include "gtest/gtest.h"
+#include <GL/glew.h>
+
 #include "colorspace_conversion_effect.h"
+#include "gtest/gtest.h"
+#include "test_util.h"
 
 TEST(ColorspaceConversionEffectTest, Reversible) {
 	float data[] = {
@@ -16,11 +18,11 @@ TEST(ColorspaceConversionEffectTest, Reversible) {
 	float temp_data[4 * 6], out_data[4 * 6];
 
 	{
-		EffectChainTester tester(data, 1, 6, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+		EffectChainTester tester(data, 1, 6, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 		tester.run(temp_data, GL_RGBA, COLORSPACE_REC_601_525, GAMMA_LINEAR);
 	}
 	{
-		EffectChainTester tester(temp_data, 1, 6, FORMAT_RGBA, COLORSPACE_REC_601_525, GAMMA_LINEAR);
+		EffectChainTester tester(temp_data, 1, 6, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_REC_601_525, GAMMA_LINEAR);
 		tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	}
 
@@ -37,7 +39,7 @@ TEST(ColorspaceConversionEffectTest, sRGB_Primaries) {
 	};
 	float out_data[4 * 5];
 
-	EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.run(out_data, GL_RGBA, COLORSPACE_XYZ, GAMMA_LINEAR);
 
 	// Black should stay black.
@@ -95,7 +97,7 @@ TEST(ColorspaceConversionEffectTest, Rec601_525_Primaries) {
 	};
 	float out_data[4 * 5];
 
-	EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_REC_601_525, GAMMA_LINEAR);
+	EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_REC_601_525, GAMMA_LINEAR);
 	tester.run(out_data, GL_RGBA, COLORSPACE_XYZ, GAMMA_LINEAR);
 
 	// Black should stay black.
@@ -145,7 +147,7 @@ TEST(ColorspaceConversionEffectTest, Rec601_625_Primaries) {
 	};
 	float out_data[4 * 5];
 
-	EffectChainTester tester(data, 1, 5, FORMAT_RGBA, COLORSPACE_REC_601_625, GAMMA_LINEAR);
+	EffectChainTester tester(data, 1, 5, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_REC_601_625, GAMMA_LINEAR);
 	tester.run(out_data, GL_RGBA, COLORSPACE_XYZ, GAMMA_LINEAR);
 
 	// Black should stay black.
@@ -221,7 +223,7 @@ TEST(ColorspaceConversionEffectTest, sRGBToRec601_525) {
 	};
 	float out_data[4 * 6];
 
-	EffectChainTester tester(data, 1, 6, FORMAT_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data, 1, 6, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	tester.run(out_data, GL_RGBA, COLORSPACE_REC_601_525, GAMMA_LINEAR);
 
 	expect_equal(expected_data, out_data, 4, 6);