Zebediah Figura : ddraw: Stop setting the device state in d3d_device7_SetLight() and d3d_device7_LightEnable().

Alexandre Julliard julliard at winehq.org
Tue Mar 3 16:24:54 CST 2020


Module: wine
Branch: master
Commit: 194b1234a97e9fa9b6cdc445d2e92bdbc638094c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=194b1234a97e9fa9b6cdc445d2e92bdbc638094c

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Fri Feb 28 14:18:46 2020 -0600

ddraw: Stop setting the device state in d3d_device7_SetLight() and d3d_device7_LightEnable().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ddraw/device.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 56debb7175..39626157a5 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -5539,8 +5539,6 @@ static HRESULT d3d_device7_SetLight(IDirect3DDevice7 *iface, DWORD light_idx, D3
     wined3d_mutex_lock();
     /* Note: D3DLIGHT7 is compatible with struct wined3d_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);
@@ -6417,8 +6415,6 @@ static HRESULT d3d_device7_LightEnable(IDirect3DDevice7 *iface, DWORD light_idx,
 
     wined3d_mutex_lock();
     hr = wined3d_stateblock_set_light_enable(device->update_state, light_idx, enabled);
-    if (SUCCEEDED(hr) && !device->recording)
-        hr = wined3d_device_set_light_enable(device->wined3d_device, light_idx, enabled);
     wined3d_mutex_unlock();
 
     return hr_ddraw_from_wined3d(hr);




More information about the wine-cvs mailing list