ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: Handle stateblocks 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:
Zebediah Figura 2019-09-30 20:28:35 -05:00 committed by Alexandre Julliard
parent 157aac1b23
commit 41f0096d5e
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/d3d8/device.c
View File

@ -2814,9 +2814,15 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD
TRACE("Setting FVF, %#x\n", shader);
wined3d_mutex_lock();
wined3d_device_set_vertex_declaration(device->wined3d_device,
wined3d_stateblock_set_vertex_declaration(device->update_state,
d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration);
wined3d_device_set_vertex_shader(device->wined3d_device, 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();
return D3D_OK;
@ -2833,9 +2839,15 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD
return D3DERR_INVALIDCALL;
}
wined3d_device_set_vertex_declaration(device->wined3d_device,
wined3d_stateblock_set_vertex_declaration(device->update_state,
shader_impl->vertex_declaration->wined3d_vertex_declaration);
wined3d_device_set_vertex_shader(device->wined3d_device, 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();
return D3D_OK;