d3dx8: Implement D3DXMatrixStack_MultMatrix.

8cdbeacd · Jerome Gardou · Alexandre Julliard · 6b6b8d9b · 8cdbeacd
Commit 8cdbeacd authored Nov 12, 2008 by Jerome Gardou Committed by Alexandre Julliard Nov 26, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

math.c dlls/d3dx8/math.c +7 -2

No files found.
--- 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)