ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Fix D3DXMatrixStack_LoadMatrix to make tests pass in Windows.

This commit is contained in:
David Adam 2009-07-17 17:51:50 +02:00 committed by Alexandre Julliard
parent 8823decbd4
commit c88860a221
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3dx9_36/math.c
View File

@ -844,7 +844,6 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, C
TRACE("iface %p\n", iface); TRACE("iface %p\n", iface);
if (!pm) return D3DERR_INVALIDCALL;
This->stack[This->current] = *pm; This->stack[This->current] = *pm;
return D3D_OK; return D3D_OK;

3
dlls/d3dx9_36/tests/math.c
View File

@ -1483,9 +1483,6 @@ static void test_matrix_stack(void)
hr = ID3DXMatrixStack_Push(stack); hr = ID3DXMatrixStack_Push(stack);
ok(SUCCEEDED(hr), "Push failed, hr %#x\n", hr); ok(SUCCEEDED(hr), "Push failed, hr %#x\n", hr);
hr = ID3DXMatrixStack_LoadMatrix(stack, NULL);
ok(hr == D3DERR_INVALIDCALL, "LoadMatrix returned %#x, expected D3DERR_INVALIDCALL\n", hr);
hr = ID3DXMatrixStack_LoadMatrix(stack, &mat1); hr = ID3DXMatrixStack_LoadMatrix(stack, &mat1);
ok(SUCCEEDED(hr), "LoadMatrix failed, hr %#x\n", hr); ok(SUCCEEDED(hr), "LoadMatrix failed, hr %#x\n", hr);
expect_mat(&mat1, ID3DXMatrixStack_GetTop(stack)); expect_mat(&mat1, ID3DXMatrixStack_GetTop(stack));