Module: wine Branch: master Commit: 47fdb6d9144cfaf9bb4585e7573aa57ade067a8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=47fdb6d9144cfaf9bb4585e75...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed Oct 30 21:34:41 2019 -0500
ddraw: Handle stateblocks in d3d_device7_SetMaterial().
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 525dd98d78..cef865948b 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;