Module: wine Branch: master Commit: 81d520cd676206069c2295e73e0c6966a54de36a URL: https://source.winehq.org/git/wine.git/?a=commit;h=81d520cd676206069c2295e73...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed Oct 30 21:34:39 2019 -0500
d3d9: Handle stateblocks in d3d9_device_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/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7b9be1fc46..7224c31e6e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2158,7 +2158,9 @@ static HRESULT WINAPI d3d9_device_SetMaterial(IDirect3DDevice9Ex *iface, const D
/* Note: D3DMATERIAL9 is compatible with struct wined3d_material. */ wined3d_mutex_lock(); - wined3d_device_set_material(device->wined3d_device, (const 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;