X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=colorspace_conversion_effect_test.cpp;h=76bcd49aaa6272895b5c6d5e5f0ac6685f2bb488;hp=34793ab307add94320bb126aa3260f234bac21ba;hb=c5cd45a98c89b983f53fd8759c4e0a3cb286b96b;hpb=696fae62e66f803a759afc004c3657ee84420bfe

diff --git a/colorspace_conversion_effect_test.cpp b/colorspace_conversion_effect_test.cpp
index 34793ab..76bcd49 100644
--- a/colorspace_conversion_effect_test.cpp
+++ b/colorspace_conversion_effect_test.cpp
@@ -1,10 +1,12 @@
-// Unit tests for ColorSpaceConversionEffect.
+// Unit tests for ColorspaceConversionEffect.
+
+#include <GL/glew.h>
 
-#include "test_util.h"
-#include "gtest/gtest.h"
 #include "colorspace_conversion_effect.h"
+#include "gtest/gtest.h"
+#include "test_util.h"
 
-TEST(ColorSpaceConversionEffectTest, Reversible) {
+TEST(ColorspaceConversionEffectTest, Reversible) {
 	float data[] = {
 		0.0f, 0.0f, 0.0f, 1.0f,
 		1.0f, 1.0f, 1.0f, 1.0f,
@@ -16,18 +18,18 @@ 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);
 	}
 
 	expect_equal(data, out_data, 4, 6);
 }
 
-TEST(ColorSpaceConversionEffectTest, sRGB_Primaries) {
+TEST(ColorspaceConversionEffectTest, sRGB_Primaries) {
 	float data[] = {
 		0.0f, 0.0f, 0.0f, 1.0f,
 		1.0f, 1.0f, 1.0f, 1.0f,
@@ -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.
@@ -85,7 +87,7 @@ TEST(ColorSpaceConversionEffectTest, sRGB_Primaries) {
 	EXPECT_FLOAT_EQ(1.0f, out_data[4 * 4 + 3]);
 }
 
-TEST(ColorSpaceConversionEffectTest, Rec601_525_Primaries) {
+TEST(ColorspaceConversionEffectTest, Rec601_525_Primaries) {
 	float data[] = {
 		0.0f, 0.0f, 0.0f, 1.0f,
 		1.0f, 1.0f, 1.0f, 1.0f,
@@ -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.
@@ -135,7 +137,7 @@ TEST(ColorSpaceConversionEffectTest, Rec601_525_Primaries) {
 	EXPECT_FLOAT_EQ(1.0f, out_data[4 * 4 + 3]);
 }
 
-TEST(ColorSpaceConversionEffectTest, Rec601_625_Primaries) {
+TEST(ColorspaceConversionEffectTest, Rec601_625_Primaries) {
 	float data[] = {
 		0.0f, 0.0f, 0.0f, 1.0f,
 		1.0f, 1.0f, 1.0f, 1.0f,
@@ -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.
@@ -185,7 +187,7 @@ TEST(ColorSpaceConversionEffectTest, Rec601_625_Primaries) {
 	EXPECT_FLOAT_EQ(1.0f, out_data[4 * 4 + 3]);
 }
 
-TEST(ColorSpaceConversionEffectTest, sRGBToRec601_525) {
+TEST(ColorspaceConversionEffectTest, sRGBToRec601_525) {
 	float data[] = {
 		0.0f, 0.0f, 0.0f, 1.0f,
 		1.0f, 1.0f, 1.0f, 1.0f,
@@ -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);