X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=overlay_effect_test.cpp;h=597c59c7eaed25d76a26b187eeb0676209d46596;hp=d0867a13136e504a82bfa1a5dd3a0df9524186f1;hb=131e7179b596f8268fd80c32312849da83581e55;hpb=2ee9c77ad76449314d28d62f60e10d80039c2353

diff --git a/overlay_effect_test.cpp b/overlay_effect_test.cpp
index d0867a1..597c59c 100644
--- a/overlay_effect_test.cpp
+++ b/overlay_effect_test.cpp
@@ -1,8 +1,15 @@
 // Unit tests for OverlayEffect.
 
-#include "test_util.h"
+#include <GL/glew.h>
+
+#include "effect_chain.h"
 #include "gtest/gtest.h"
+#include "image_format.h"
+#include "input.h"
 #include "overlay_effect.h"
+#include "test_util.h"
+
+namespace movit {
 
 TEST(OverlayEffectTest, TopDominatesBottomWhenNoAlpha) {
 	float data_a[] = {
@@ -32,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);
 }
@@ -53,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]);
 }
@@ -77,12 +84,14 @@ 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);
 }
+
+}  // namespace movit