[PATCH] Implement D3DX__Maximize with a test

[David Adam]

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

diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index 95d04e9..550d1b4 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -243,6 +243,16 @@ static void D3X8Vector3Test(void)
     funcpointer =3D D3DXVec3Lerp(NULL,NULL,NULL,scale);
     ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
=20
+/*_______________D3DXVec3Maximize__________________________*/
+    expectedvec.x =3D 9.0f; expectedvec.y =3D 6.0f; expectedvec.z =3D 2.0f;
+    D3DXVec3Maximize(&gotvec,&u,&v);
+    expect_vec3(expectedvec,gotvec);
+    /* Tests the case NULL */
+    funcpointer =3D D3DXVec3Maximize(&gotvec,NULL,&v);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXVec3Maximize(NULL,NULL,NULL);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+
 /*_______________D3DXVec3Subtract_______________________*/
     expectedvec.x =3D 7.0f; expectedvec.y =3D 9.0f; expectedvec.z =3D 6.0f;=
=20
     D3DXVec3Subtract(&gotvec,&u,&v);
@@ -315,6 +325,16 @@ static void D3X8Vector4Test(void)
     funcpointer =3D D3DXVec4Lerp(NULL,NULL,NULL,scale);
     ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
=20
+/*_______________D3DXVec4Maximize__________________________*/
+    expectedvec.x =3D 1.0f; expectedvec.y =3D 4.0f; expectedvec.z =3D 4.0f;=
 expectedvec.w =3D 10.0;
+    D3DXVec4Maximize(&gotvec,&u,&v);
+    expect_vec4(expectedvec,gotvec);
+    /* Tests the case NULL */
+    funcpointer =3D D3DXVec4Maximize(&gotvec,NULL,&v);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+    funcpointer =3D D3DXVec4Maximize(NULL,NULL,NULL);
+    ok(funcpointer =3D=3D NULL, "Expected: %p, Got: %p\n", NULL, funcpointe=
r);
+
 /*_______________D3DXVec4Subtract__________________________*/
     expectedvec.x =3D 4.0f; expectedvec.y =3D -2.0f; expectedvec.z =3D 9.0f=
; expectedvec.w =3D 3.0f;
     D3DXVec4Subtract(&gotvec,&u,&v);
diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl
index 7aeb94c..d043cba 100644
--- a/include/d3dx8math.inl
+++ b/include/d3dx8math.inl
@@ -131,6 +131,15 @@ static inline D3DXVECTOR3* D3DXVec3Lerp(D3DXVECTOR3 *po=
ut, CONST D3DXVECTOR3 *pv
     return pout;
 }
=20
+static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, CONST D3DXVE=
CTOR3 *pv1, CONST D3DXVECTOR3 *pv2)
+{
+    if ( !pout || !pv1 || !pv2) return NULL;
+    pout->x =3D max(pv1->x , pv2->x);
+    pout->y =3D max(pv1->y , pv2->y);
+    pout->z =3D max(pv1->z , pv2->z);=20
+    return pout;
+}
+
 static inline D3DXVECTOR3* D3DXVec3Subtract(D3DXVECTOR3 *pout, CONST D3DXVE=
CTOR3 *pv1, CONST D3DXVECTOR3 *pv2)
 {
     if ( !pout || !pv1 || !pv2) return NULL;
@@ -179,6 +188,17 @@ static inline D3DXVECTOR4* D3DXVec4Lerp(D3DXVECTOR4 *po=
ut, CONST D3DXVECTOR4 *pv
     return pout;
 }
=20
+
+static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, CONST D3DXVE=
CTOR4 *pv1, CONST D3DXVECTOR4 *pv2)
+{
+    if ( !pout || !pv1 || !pv2) return NULL;
+    pout->x =3D max(pv1->x , pv2->x);
+    pout->y =3D max(pv1->y , pv2->y);
+    pout->z =3D max(pv1->z , pv2->z);=20
+    pout->w =3D max(pv1->w , pv2->w);
+    return pout;
+}
+
 static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVE=
CTOR4 *pv1, CONST D3DXVECTOR4 *pv2)
 {
     if ( !pout || !pv1 || !pv2) return NULL;
--=20
1.5.3.2


--=_70m7cutw36kg--