Zebediah Figura : ddraw: Stop setting the device state in d3d_device7_SetRenderState().

Alexandre Julliard julliard at winehq.org
Thu Feb 6 15:44:17 CST 2020


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Jan 30 21:26:06 2020 -0600

ddraw: Stop setting the device state in d3d_device7_SetRenderState().

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 | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 6cd8948f56..3a35eaeb5e 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -2501,14 +2501,6 @@ static HRESULT WINAPI d3d_device2_GetRenderState(IDirect3DDevice2 *iface,
     return IDirect3DDevice3_GetRenderState(&device->IDirect3DDevice3_iface, state, value);
 }
 
-static void d3d_device_set_render_state(struct d3d_device *device,
-        enum wined3d_render_state state, DWORD value)
-{
-    wined3d_stateblock_set_render_state(device->update_state, state, value);
-    if (!device->recording)
-        wined3d_device_set_render_state(device->wined3d_device, state, value);
-}
-
 static void d3d_device_set_sampler_state(struct d3d_device *device,
         UINT sampler_idx, enum wined3d_sampler_state state, DWORD value)
 {
@@ -2649,7 +2641,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface,
             break;
 
         case D3DRENDERSTATE_ZBIAS:
-            d3d_device_set_render_state(device, WINED3D_RS_DEPTHBIAS, value);
+            wined3d_stateblock_set_render_state(device->update_state, WINED3D_RS_DEPTHBIAS, value);
             break;
 
         default:
@@ -2661,7 +2653,7 @@ static HRESULT d3d_device7_SetRenderState(IDirect3DDevice7 *iface,
                 break;
             }
 
-            d3d_device_set_render_state(device, state, value);
+            wined3d_stateblock_set_render_state(device->update_state, state, value);
             break;
     }
     wined3d_mutex_unlock();




More information about the wine-cvs mailing list