From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 20 Mar 2014 21:48:32 +0000 (+0100)
Subject: Ditch BGRA use in OverlayEffectTest.
X-Git-Tag: 1.1~32
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=55cff1809758210474fe6c22aaed8033d10343b3;hp=e039fbd29a207e849418f3820d1b456ce49bba50

Ditch BGRA use in OverlayEffectTest.
---

diff --git a/overlay_effect_test.cpp b/overlay_effect_test.cpp
index 0a9682e..597c59c 100644
--- a/overlay_effect_test.cpp
+++ b/overlay_effect_test.cpp
@@ -39,12 +39,12 @@ TEST(OverlayEffectTest, BottomDominatesTopWhenTopIsTransparent) {
 		0.5f, 0.5f, 0.5f, 0.0f,
 	};
 	float out_data[4];
-	EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data_a, 1, 1, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input2 = tester.add_input(data_b, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
-	tester.run(out_data, GL_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(data_a, out_data, 4, 1);
 }
@@ -60,12 +60,12 @@ TEST(OverlayEffectTest, ZeroAlphaRemainsZeroAlpha) {
 		0.0f, 0.0f, 0.0f, 0.0f
 	};
 	float out_data[4];
-	EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data_a, 1, 1, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input2 = tester.add_input(data_b, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
-	tester.run(out_data, GL_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	EXPECT_FLOAT_EQ(0.0f, expected_data[3]);
 }
@@ -84,12 +84,12 @@ TEST(OverlayEffectTest, PhotoshopReferenceTest) {
 		179.0f/255.0f, 153.0f/255.0f, 51.0f/255.0f, 0.625f
 	};
 	float out_data[4];
-	EffectChainTester tester(data_a, 1, 1, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	EffectChainTester tester(data_a, 1, 1, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 	Effect *input1 = tester.get_chain()->last_added_effect();
-	Effect *input2 = tester.add_input(data_b, FORMAT_BGRA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	Effect *input2 = tester.add_input(data_b, FORMAT_RGBA_POSTMULTIPLIED_ALPHA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	tester.get_chain()->add_effect(new OverlayEffect(), input1, input2);
-	tester.run(out_data, GL_BGRA, COLORSPACE_sRGB, GAMMA_LINEAR);
+	tester.run(out_data, GL_RGBA, COLORSPACE_sRGB, GAMMA_LINEAR);
 
 	expect_equal(expected_data, out_data, 4, 1);
 }