Zebediah Figura : d3d9: Stop setting the device state when setting pixel shader constants.

Alexandre Julliard julliard at winehq.org
Tue Feb 11 15:44:55 CST 2020


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon Feb 10 20:56:00 2020 -0600

d3d9: Stop setting the device state when setting pixel shader constants.

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

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index f6ff9466b1..1ff178881c 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3899,9 +3899,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(IDirect3DDevice9Ex *if
     wined3d_mutex_lock();
     hr = wined3d_stateblock_set_ps_consts_f(device->update_state,
             reg_idx, count, (const struct wined3d_vec4 *)data);
-    if (SUCCEEDED(hr) && !device->recording)
-        hr = wined3d_device_set_ps_consts_f(device->wined3d_device,
-                reg_idx, count, (const struct wined3d_vec4 *)data);
     wined3d_mutex_unlock();
 
     return hr;
@@ -3937,9 +3934,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if
     wined3d_mutex_lock();
     hr = wined3d_stateblock_set_ps_consts_i(device->update_state,
             reg_idx, count, (const struct wined3d_ivec4 *)data);
-    if (SUCCEEDED(hr) && !device->recording)
-        hr = wined3d_device_set_ps_consts_i(device->wined3d_device,
-                reg_idx, count, (const struct wined3d_ivec4 *)data);
     wined3d_mutex_unlock();
 
     return hr;
@@ -3976,8 +3970,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if
 
     wined3d_mutex_lock();
     hr = wined3d_stateblock_set_ps_consts_b(device->update_state, reg_idx, count, data);
-    if (SUCCEEDED(hr) && !device->recording)
-        hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data);
     wined3d_mutex_unlock();
 
     return hr;




More information about the wine-cvs mailing list