Module: wine Branch: master Commit: 0914a2f2af31f118d9ab5f3eac438604de6baf18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0914a2f2af31f118d9ab5f3ea...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed Nov 13 21:47:50 2019 -0600
ddraw: Handle stateblocks in d3d_device7_SetLight().
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 e2643e6589..55a9c6b6a1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5545,7 +5545,9 @@ static HRESULT d3d_device7_SetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3
wined3d_mutex_lock(); /* Note: D3DLIGHT7 is compatible with struct wined3d_light. */ - hr = wined3d_device_set_light(device->wined3d_device, light_idx, (struct wined3d_light *)light); + hr = wined3d_stateblock_set_light(device->update_state, light_idx, (const struct wined3d_light *)light); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_light(device->wined3d_device, light_idx, (const struct wined3d_light *)light); wined3d_mutex_unlock();
return hr_ddraw_from_wined3d(hr);