From 47fdb6d9144cfaf9bb4585e7573aa57ade067a8d Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 30 Oct 2019 21:34:41 -0500 Subject: [PATCH] ddraw: Handle stateblocks in d3d_device7_SetMaterial(). Signed-off-by: Zebediah Figura Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 525dd98d786..cef865948b6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5448,7 +5448,9 @@ static HRESULT d3d_device7_SetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - wined3d_device_set_material(device->wined3d_device, (struct wined3d_material *)material); + wined3d_stateblock_set_material(device->update_state, (const struct wined3d_material *)material); + if (!device->recording) + wined3d_device_set_material(device->wined3d_device, (const struct wined3d_material *)material); wined3d_mutex_unlock(); return D3D_OK;