[PATCH 05/10] ddraw: Introduce a helper to convert ddraw stateblock types to wined3d types.
Henri Verbeet
hverbeet at codeweavers.com
Tue Mar 31 10:09:15 CDT 2020
From: Chip Davis <cdavis at codeweavers.com>
Signed-off-by: Chip Davis <cdavis at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/ddraw/device.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index ede9c77031a..e09100dfdc7 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -101,6 +101,11 @@ static enum wined3d_primitive_type wined3d_primitive_type_from_ddraw(D3DPRIMITIV
return (enum wined3d_primitive_type)type;
}
+static enum wined3d_stateblock_type wined3d_stateblock_type_from_ddraw(D3DSTATEBLOCKTYPE type)
+{
+ return (enum wined3d_stateblock_type)type;
+}
+
static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface)
{
return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner);
@@ -5969,9 +5974,8 @@ static HRESULT d3d_device7_CreateStateBlock(IDirect3DDevice7 *iface,
return D3DERR_INBEGINSTATEBLOCK;
}
- /* The D3DSTATEBLOCKTYPE enum is fine here. */
- hr = wined3d_stateblock_create(device->wined3d_device, device->state, type, &wined3d_sb);
- if (FAILED(hr))
+ if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device,
+ device->state, wined3d_stateblock_type_from_ddraw(type), &wined3d_sb)))
{
WARN("Failed to create stateblock, hr %#x.\n", hr);
wined3d_mutex_unlock();
--
2.20.1
More information about the wine-devel
mailing list