From 23d9da1eb9d167d8d2eec14352f8d193a345332a Mon Sep 17 00:00:00 2001
From: David Adam <David.Adam@math.cnrs.fr>
Date: Sat, 3 Nov 2007 09:57:33 +0100
Subject: [PATCH] d3dx8: Implement D3DXMatrixPerspectiveOrthoRH.

---
 dlls/d3dx8/d3dx8.spec   |  2 +-
 dlls/d3dx8/math.c       | 10 ++++++++++
 dlls/d3dx8/tests/math.c |  6 ++++++
 include/d3dx8math.h     |  1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec
index e9f2280cf74..8621e60efde 100644
--- a/dlls/d3dx8/d3dx8.spec
+++ b/dlls/d3dx8/d3dx8.spec
@@ -42,7 +42,7 @@
 @ stdcall D3DXMatrixPerspectiveFovLH(ptr long long long long)
 @ stdcall D3DXMatrixPerspectiveOffCenterRH(ptr long long long long long long)
 @ stdcall D3DXMatrixPerspectiveOffCenterLH(ptr long long long long long long)
-@ stub D3DXMatrixOrthoRH
+@ stdcall D3DXMatrixOrthoRH(ptr long long long long)
 @ stub D3DXMatrixOrthoLH
 @ stub D3DXMatrixOrthoOffCenterRH
 @ stub D3DXMatrixOrthoOffCenterLH
diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index 2ac4bb215c6..ef38f0b20f1 100644
--- a/dlls/d3dx8/math.c
+++ b/dlls/d3dx8/math.c
@@ -116,6 +116,16 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C
     return pout;
 }
 
+D3DXMATRIX* WINAPI D3DXMatrixOrthoRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf)
+{
+    D3DXMatrixIdentity(pout);
+    pout->m[0][0] = 2.0f / w;
+    pout->m[1][1] = 2.0f / h;
+    pout->m[2][2] = 1.0f / (zn - zf);
+    pout->m[3][2] = zn / (zn - zf);
+    return pout;
+}
+
 D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf)
 {
     D3DXMatrixIdentity(pout);
diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c
index d61ee77b212..ba285f2ff25 100644
--- a/dlls/d3dx8/tests/math.c
+++ b/dlls/d3dx8/tests/math.c
@@ -222,6 +222,12 @@ static void D3DXMatrixTest(void)
     D3DXMatrixMultiply(&gotmat,&mat,&mat2);
     expect_mat(expectedmat,gotmat);
 
+/*____________D3DXMatrixOrthoRH_______________*/
+    D3DXMatrixIdentity(&expectedmat);
+    expectedmat.m[0][0] = 0.8f; expectedmat.m[1][1] = 0.270270f; expectedmat.m[2][2] = 0.151515f; expectedmat.m[3][2] = -0.484848f;
+    D3DXMatrixOrthoRH(&gotmat, 2.5f, 7.4f, -3.2f, -9.8f);
+    expect_mat(expectedmat,gotmat);
+
 /*____________D3DXMatrixPerspectiveFovLH_______________*/
     expectedmat.m[0][0] = 13.288858f; expectedmat.m[0][1] = 0.0f; expectedmat.m[0][2] = 0.0f; expectedmat.m[0][3] = 0.0f;
     expectedmat.m[1][0] = 0.0f; expectedmat.m[1][1] = 9.966644f; expectedmat.m[1][2] = 0.0; expectedmat.m[1][3] = 0.0f;
diff --git a/include/d3dx8math.h b/include/d3dx8math.h
index 61098335f48..59389d2406f 100644
--- a/include/d3dx8math.h
+++ b/include/d3dx8math.h
@@ -62,6 +62,7 @@ FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm);
 D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);
 D3DXMATRIX* WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *pout, CONST D3DXVECTOR3 *peye, CONST D3DXVECTOR3 *pat, CONST D3DXVECTOR3 *pup);
 D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, CONST D3DXMATRIX *pm2);
+D3DXMATRIX* WINAPI D3DXMatrixOrthoRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
 D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf);
 D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovRH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf);
 D3DXMATRIX* WINAPI D3DXMatrixPerspectiveLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf);
-- 
2.11.4.GIT