d3d8: Stop setting the device state in d3d8_device_SetVertexShader().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
1dca8313ce
commit
4579ea5906
|
@ -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
|
||||||
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;
|
||||||
|
|
Loading…
Reference in New Issue