[PATCH] Implement D3DXColorAdd with a test

[David Adam]

---
 dlls/d3dx8/tests/math.c |   12 ++++++++++++
 include/d3dx8math.inl   |   10 ++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index 5d6806e..c32920e 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -43,6 +43,18 @@ static void D3DXColorTest(void)
     color2.r =3D 0.3f; color2.g =3D 0.5f; color2.b =3D 0.76f; color2.a =3D =
0.11f;=20
     scale =3D 0.3f;
=20
+/*_______________D3DXColorAdd________________*/
+    expected.r =3D 0.9f; expected.g =3D 1.05f; expected.b =3D 0.99f, expect=
ed.a =3D 0.93f;
+    D3DXColorAdd(&got,&color1,&color2);
+    expect_color(expected,got);
+    /* Test the NULL case */
+    funcpointer =3D D3DXColorAdd(&got,NULL,&color2);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXColorAdd(NULL,NULL,&color2);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXColorAdd(NULL,NULL,NULL);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+
 /*_______________D3DXColorLerp________________*/
     expected.r =3D 0.32f; expected.g =3D 0.69f; expected.b =3D 0.356f; expe=
cted.a =3D 0.897f;
     D3DXColorLerp(&got,&color,&color1,scale);
diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl
index 50a1144..78ef7c5 100644
--- a/include/d3dx8math.inl
+++ b/include/d3dx8math.inl
@@ -21,6 +21,16 @@
=20
 /*_______________D3DXCOLOR_____________________*/
=20
+static inline D3DXCOLOR* D3DXColorAdd(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1=
, CONST D3DXCOLOR *pc2)
+{
+    if ( !pout || !pc1 || !pc2 ) return NULL;
+    pout->r =3D (pc1->r) + (pc2->r);
+    pout->g =3D (pc1->g) + (pc2->g);
+    pout->b =3D (pc1->b) + (pc2->b);
+    pout->a =3D (pc1->a) + (pc2->a);
+    return pout;
+}
+
 static inline D3DXCOLOR* D3DXColorLerp(D3DXCOLOR *pout, CONST D3DXCOLOR *pc=
1, CONST D3DXCOLOR *pc2, FLOAT s)
 {
     if ( !pout || !pc1 || !pc2 ) return NULL;
--=20
1.5.3.2


--=_mfzuc4fyatc--