Jerome Gardou : d3dx8: Implement D3DXMatrixStack_MultMatrix.

Alexandre Julliard julliard at winehq.org
Wed Nov 26 07:32:46 CST 2008


Module: wine
Branch: master
Commit: 8cdbeacd59b9534daeb615c8a5446bbcad2c0f79
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8cdbeacd59b9534daeb615c8a5446bbcad2c0f79

Author: Jerome Gardou <jerome.gardou at gmail.com>
Date:   Wed Nov 12 08:45:19 2008 +0100

d3dx8: Implement D3DXMatrixStack_MultMatrix.

---

 dlls/d3dx8/math.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx8/math.c b/dlls/d3dx8/math.c
index f41c9f4..34c177a 100644
--- a/dlls/d3dx8/math.c
+++ b/dlls/d3dx8/math.c
@@ -686,8 +686,13 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, C
 static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm)
 {
     ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface;
-    FIXME("(%p) : stub\n",This);
-    return E_NOTIMPL;
+
+    TRACE("iface %p\n", iface);
+
+    if (!pm) return D3DERR_INVALIDCALL;
+    D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], pm);
+
+    return D3D_OK;
 }
 
 static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm)




More information about the wine-cvs mailing list