system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

d3d10: Implement D3D10StateBlockMaskUnion().

Browse source
This commit is contained in:
Henri Verbeet 2011-11-17 20:11:37 +01:00 committed by Alexandre Julliard
parent f5e7de6bb9
commit 989a643587
4 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/d3d10/d3d10.spec
View file

@ -26,4 +26,4 @@
@ stdcall D3D10StateBlockMaskEnableCapture(ptr long long long) @ stdcall D3D10StateBlockMaskEnableCapture(ptr long long long)
@ stdcall D3D10StateBlockMaskGetSetting(ptr long long) @ stdcall D3D10StateBlockMaskGetSetting(ptr long long)
@ stdcall D3D10StateBlockMaskIntersect(ptr ptr ptr) @ stdcall D3D10StateBlockMaskIntersect(ptr ptr ptr)
@ stub D3D10StateBlockMaskUnion @ stdcall D3D10StateBlockMaskUnion(ptr ptr ptr)

23
dlls/d3d10/stateblock.c
View file

@ -508,3 +508,26 @@ HRESULT WINAPI D3D10StateBlockMaskIntersect(D3D10_STATE_BLOCK_MASK *mask_x,
return S_OK; return S_OK;
} }
HRESULT WINAPI D3D10StateBlockMaskUnion(D3D10_STATE_BLOCK_MASK *mask_x,
D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result)
{
UINT count = sizeof(*result) / sizeof(DWORD);
UINT i;
TRACE("mask_x %p, mask_y %p, result %p.\n", mask_x, mask_y, result);
if (!mask_x || !mask_y || !result)
return E_INVALIDARG;
for (i = 0; i < count; ++i)
{
((DWORD *)result)[i] = ((DWORD *)mask_x)[i] | ((DWORD *)mask_y)[i];
}
for (i = count * sizeof(DWORD); i < sizeof(*result); ++i)
{
((BYTE *)result)[i] = ((BYTE *)mask_x)[i] | ((BYTE *)mask_y)[i];
}
return S_OK;
}

11
dlls/d3d10/tests/device.c
View file

@ -128,6 +128,17 @@ static void test_stateblock_mask(void)
hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL);
ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr);
hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, &result);
ok(SUCCEEDED(hr), "D3D10StateBlockMaskUnion failed, hr %#x.\n", hr);
ok(result.VS == 0x77, "Got unexpected result.VS %#x.\n", result.VS);
ok(result.Predication == 0xbb, "Got unexpected result.Predication %#x.\n", result.Predication);
hr = D3D10StateBlockMaskUnion(NULL, &mask_y, &result);
ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr);
hr = D3D10StateBlockMaskUnion(&mask_x, NULL, &result);
ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr);
hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, NULL);
ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr);
memset(&result, 0xff, sizeof(result)); memset(&result, 0xff, sizeof(result));
hr = D3D10StateBlockMaskDisableAll(&result); hr = D3D10StateBlockMaskDisableAll(&result);
ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr); ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr);

2
include/d3d10effect.h
View file

@ -844,6 +844,8 @@ BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask,
D3D10_DEVICE_STATE_TYPES state_type, UINT idx); D3D10_DEVICE_STATE_TYPES state_type, UINT idx);
HRESULT WINAPI D3D10StateBlockMaskIntersect(D3D10_STATE_BLOCK_MASK *mask_x, HRESULT WINAPI D3D10StateBlockMaskIntersect(D3D10_STATE_BLOCK_MASK *mask_x,
D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result); D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result);
HRESULT WINAPI D3D10StateBlockMaskUnion(D3D10_STATE_BLOCK_MASK *mask_x,
D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result);
#ifdef __cplusplus #ifdef __cplusplus
} }