Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantF().
Alexandre Julliard
julliard at winehq.org
Wed Oct 2 17:47:37 CDT 2019
Module: wine
Branch: master
Commit: 334e4880b33fe2a1bc79a7738c335b599517c0a9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=334e4880b33fe2a1bc79a7738c335b599517c0a9
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Oct 1 20:03:52 2019 -0500
d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantF().
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 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 90882f0f92..539af97fbb 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3815,8 +3815,11 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(IDirect3DDevice9Ex *if
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_set_ps_consts_f(device->wined3d_device,
+ 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;
More information about the wine-cvs
mailing list