[PATCH] Implement D3DXColorModulate with a test

[David Adam]

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

diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index fbb8ab3..6ff0d0c 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -34,15 +34,16 @@
=20
 static void D3DXColorTest(void)
 {
-    D3DXCOLOR color, color1, expected, got;
+    D3DXCOLOR color, color1, color2, expected, got;
     LPD3DXCOLOR funcpointer;
     FLOAT scale;
=20
     color.r =3D 0.2f; color.g =3D 0.75f; color.b =3D 0.41f; color.a =3D 0.9=
3f;
+    color1.r =3D 0.6f; color1.g =3D 0.55f; color1.b =3D 0.23f; color1.a =3D=
 0.82f;
+    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
 /*_______________D3DXColorLerp________________*/
-    color1.r =3D 0.6f; color1.g =3D 0.55f; color1.b =3D 0.23f; color1.a =3D=
 0.82f;
     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);
     expect_color(expected,got);
@@ -54,6 +55,18 @@ static void D3DXColorTest(void)
     funcpointer =3D D3DXColorLerp(NULL,NULL,NULL,scale);
     ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
=20
+/*_______________D3DXColorModulate________________*/
+    expected.r =3D 0.18f; expected.g =3D 0.275f; expected.b =3D 0.1748f; ex=
pected.a =3D 0.0902f;
+    D3DXColorModulate(&got,&color1,&color2);
+    expect_color(expected,got);
+    /* Test the NULL case */
+    funcpointer =3D D3DXColorModulate(&got,NULL,&color2);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXColorModulate(NULL,NULL,&color2);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXColorModulate(NULL,NULL,NULL);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+
 /*_______________D3DXColorNegative________________*/
     expected.r =3D 0.8f; expected.g =3D 0.25f; expected.b =3D 0.59f; expect=
ed.a =3D 0.93f;
     D3DXColorNegative(&got,&color);
diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl
index da11f31..21e8fc8 100644
--- a/include/d3dx8math.inl
+++ b/include/d3dx8math.inl
@@ -31,6 +31,16 @@ static inline D3DXCOLOR* D3DXColorLerp(D3DXCOLOR *pout, C=
ONST D3DXCOLOR *pc1, CO
     return pout;
 }
=20
+static inline D3DXCOLOR* D3DXColorModulate(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* D3DXColorNegative(D3DXCOLOR *pout, CONST D3DXCOLOR=
 *pc)
 {
     if ( !pout || !pc ) return NULL;
--=20
1.5.3.2


--=_3gycinzp9y4g--