Commit 041181f1 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

d3d8: Handle stateblocks in d3d8_device_SetPixelShader().

parent 8d845795
...@@ -3144,6 +3144,8 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD ...@@ -3144,6 +3144,8 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD
if (!shader) if (!shader)
{ {
wined3d_stateblock_set_pixel_shader(device->update_state, NULL);
if (!device->recording)
wined3d_device_set_pixel_shader(device->wined3d_device, NULL); wined3d_device_set_pixel_shader(device->wined3d_device, NULL);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return D3D_OK; return D3D_OK;
...@@ -3157,6 +3159,8 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD ...@@ -3157,6 +3159,8 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD
} }
TRACE("Setting shader %p.\n", shader_impl); TRACE("Setting shader %p.\n", shader_impl);
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_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
......
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