Skip to content

W
wine-winehq
Commit 3b6cbaeb authored by David Adam's avatar David Adam Committed by Alexandre Julliard
Browse files
Options

d3dx9: Fix D3DXMatrixStack_MultMatrix to make tests pass in Windows.

parent c88860a2
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
dlls/d3dx9_36/math.c
View file @ 3b6cbaeb
...@@ -855,7 +855,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, C ...@@ -855,7 +855,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, C
TRACE("iface %p\n", iface); TRACE("iface %p\n", iface);
if (!pm) return D3DERR_INVALIDCALL;
D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], pm); D3DXMatrixMultiply(&This->stack[This->current], &This->stack[This->current], pm);
return D3D_OK; return D3D_OK;
......
dlls/d3dx9_36/tests/math.c
View file @ 3b6cbaeb
...@@ -1519,9 +1519,6 @@ static void test_matrix_stack(void) ...@@ -1519,9 +1519,6 @@ static void test_matrix_stack(void)
ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr); ok(SUCCEEDED(hr), "Pop failed, hr %#x\n", hr);
ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n"); ok(D3DXMatrixIsIdentity(ID3DXMatrixStack_GetTop(stack)), "The top should be an identity matrix\n");
hr = ID3DXMatrixStack_MultMatrix(stack, NULL);
ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);
hr = ID3DXMatrixStack_MultMatrixLocal(stack, NULL); hr = ID3DXMatrixStack_MultMatrixLocal(stack, NULL);
ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment