Skip to content

W
wine-winehq
Commit 4579ea59 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

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

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1dca8313
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 12 deletions
dlls/d3d8/device.c
View file @ 4579ea59
...@@ -2889,12 +2889,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD ...@@ -2889,12 +2889,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD
wined3d_stateblock_set_vertex_declaration(device->update_state, wined3d_stateblock_set_vertex_declaration(device->update_state,
d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration); d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration);
wined3d_stateblock_set_vertex_shader(device->update_state, NULL); 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(); wined3d_mutex_unlock();
return D3D_OK; return D3D_OK;
...@@ -2914,12 +2908,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD ...@@ -2914,12 +2908,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD
wined3d_stateblock_set_vertex_declaration(device->update_state, wined3d_stateblock_set_vertex_declaration(device->update_state,
shader_impl->vertex_declaration->wined3d_vertex_declaration); shader_impl->vertex_declaration->wined3d_vertex_declaration);
wined3d_stateblock_set_vertex_shader(device->update_state, shader_impl->wined3d_shader); 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(); wined3d_mutex_unlock();
return D3D_OK; return D3D_OK;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment