Module: wine Branch: master Commit: 6f97c24b6e343884fb837651fe784aa181d6a505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f97c24b6e343884fb837651f... Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:09 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetTexture(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 63bf5f4fa2..6b6f5edfbc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2135,8 +2135,11 @@ static HRESULT WINAPI d3d8_device_SetTexture(IDirect3DDevice8 *iface, DWORD stag texture_impl = unsafe_impl_from_IDirect3DBaseTexture8(texture); wined3d_mutex_lock(); - wined3d_device_set_texture(device->wined3d_device, stage, + wined3d_stateblock_set_texture(device->update_state, stage, texture_impl ? texture_impl->wined3d_texture : NULL); + if (!device->recording) + wined3d_device_set_texture(device->wined3d_device, stage, + texture_impl ? texture_impl->wined3d_texture : NULL); wined3d_mutex_unlock(); return D3D_OK;