Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetPixelShader().

Alexandre Julliard julliard at winehq.org
Fri Feb 21 15:27:05 CST 2020


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Feb 20 20:21:33 2020 -0600

d3d8: Stop setting the device state in d3d8_device_SetPixelShader().

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/d3d8/device.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index cf44fa2baa..957f663174 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -3207,8 +3207,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD
     if (!shader)
     {
         wined3d_stateblock_set_pixel_shader(device->update_state, NULL);
-        if (!device->recording)
-            wined3d_device_set_pixel_shader(device->wined3d_device, NULL);
         wined3d_mutex_unlock();
         return D3D_OK;
     }
@@ -3222,8 +3220,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD
 
     TRACE("Setting shader %p.\n", shader_impl);
     wined3d_stateblock_set_pixel_shader(device->update_state, shader_impl->wined3d_shader);
-    if (!device->recording)
-        wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader);
     wined3d_mutex_unlock();
 
     return D3D_OK;




More information about the wine-cvs mailing list