From 989a6435878304f7f1e3b783ce3aca70e66f754e Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Thu, 17 Nov 2011 20:11:37 +0100
Subject: [PATCH] d3d10: Implement D3D10StateBlockMaskUnion().

---
 dlls/d3d10/d3d10.spec     |  2 +-
 dlls/d3d10/stateblock.c   | 23 +++++++++++++++++++++++
 dlls/d3d10/tests/device.c | 11 +++++++++++
 include/d3d10effect.h     |  2 ++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec
index 42996a88e8a..d1b2b9836b9 100644
--- a/dlls/d3d10/d3d10.spec
+++ b/dlls/d3d10/d3d10.spec
@@ -26,4 +26,4 @@
 @ stdcall D3D10StateBlockMaskEnableCapture(ptr long long long)
 @ stdcall D3D10StateBlockMaskGetSetting(ptr long long)
 @ stdcall D3D10StateBlockMaskIntersect(ptr ptr ptr)
-@ stub D3D10StateBlockMaskUnion
+@ stdcall D3D10StateBlockMaskUnion(ptr ptr ptr)
diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c
index 67ccae7e01c..ef6fe3f8e20 100644
--- a/dlls/d3d10/stateblock.c
+++ b/dlls/d3d10/stateblock.c
@@ -508,3 +508,26 @@ HRESULT WINAPI D3D10StateBlockMaskIntersect(D3D10_STATE_BLOCK_MASK *mask_x,
 
     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;
+}
diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c
index 2ce0b2a4a2c..9ad742f32cd 100644
--- a/dlls/d3d10/tests/device.c
+++ b/dlls/d3d10/tests/device.c
@@ -128,6 +128,17 @@ static void test_stateblock_mask(void)
     hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL);
     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));
     hr = D3D10StateBlockMaskDisableAll(&result);
     ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr);
diff --git a/include/d3d10effect.h b/include/d3d10effect.h
index 6db61d3961e..5dbf31b8364 100644
--- a/include/d3d10effect.h
+++ b/include/d3d10effect.h
@@ -844,6 +844,8 @@ BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask,
         D3D10_DEVICE_STATE_TYPES state_type, UINT idx);
 HRESULT WINAPI D3D10StateBlockMaskIntersect(D3D10_STATE_BLOCK_MASK *mask_x,
         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
 }