Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetPixelShader().
Alexandre Julliard
julliard at winehq.org
Wed Oct 2 17:47:37 CDT 2019
Module: wine
Branch: master
Commit: 041181f1dcf83425718fd97581343379a5ce058c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=041181f1dcf83425718fd97581343379a5ce058c
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Oct 1 20:03:50 2019 -0500
d3d8: Handle stateblocks 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 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index eabefd8043..011364ccbc 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -3144,7 +3144,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD
if (!shader)
{
- wined3d_device_set_pixel_shader(device->wined3d_device, NULL);
+ 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;
}
@@ -3157,7 +3159,9 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD
}
TRACE("Setting shader %p.\n", shader_impl);
- wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader);
+ 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