Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetVertexShader().
Alexandre Julliard
julliard at winehq.org
Thu Feb 20 18:26:11 CST 2020
Module: wine
Branch: master
Commit: 4579ea590682d792893530696a9c6e1b776e0109
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4579ea590682d792893530696a9c6e1b776e0109
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Feb 19 09:53:57 2020 -0600
d3d8: Stop setting the device state in d3d8_device_SetVertexShader().
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 | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index c7e4772b3b..ef1b3afde9 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2889,12 +2889,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD
wined3d_stateblock_set_vertex_declaration(device->update_state,
d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration);
wined3d_stateblock_set_vertex_shader(device->update_state, NULL);
- if (!device->recording)
- {
- wined3d_device_set_vertex_declaration(device->wined3d_device,
- d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration);
- wined3d_device_set_vertex_shader(device->wined3d_device, NULL);
- }
wined3d_mutex_unlock();
return D3D_OK;
@@ -2914,12 +2908,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD
wined3d_stateblock_set_vertex_declaration(device->update_state,
shader_impl->vertex_declaration->wined3d_vertex_declaration);
wined3d_stateblock_set_vertex_shader(device->update_state, shader_impl->wined3d_shader);
- if (!device->recording)
- {
- wined3d_device_set_vertex_declaration(device->wined3d_device,
- shader_impl->vertex_declaration->wined3d_vertex_declaration);
- wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader);
- }
wined3d_mutex_unlock();
return D3D_OK;
More information about the wine-cvs
mailing list