Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetTextureStageState().
Alexandre Julliard
julliard at winehq.org
Wed Oct 23 15:31:31 CDT 2019
Module: wine
Branch: master
Commit: 290f0fd3b004fb4cbc4d6a164f1ce3c4862f2ba5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=290f0fd3b004fb4cbc4d6a164f1ce3c4862f2ba5
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Oct 21 21:35:57 2019 -0500
ddraw: Handle stateblocks in d3d_device7_SetTextureStageState().
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/device.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 253788c36a..3702454bde 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -5125,18 +5125,20 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface,
}
case D3DTSS_ADDRESS:
- wined3d_device_set_sampler_state(device->wined3d_device, stage, WINED3D_SAMP_ADDRESS_V, value);
+ d3d_device_set_sampler_state(device, stage, WINED3D_SAMP_ADDRESS_V, value);
break;
default:
break;
}
- wined3d_device_set_sampler_state(device->wined3d_device, stage, l->u.sampler_state, value);
+ d3d_device_set_sampler_state(device, stage, l->u.sampler_state, value);
}
else
{
- wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value);
+ wined3d_stateblock_set_texture_stage_state(device->update_state, stage, l->u.texture_state, value);
+ if (!device->recording)
+ wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->u.texture_state, value);
}
wined3d_mutex_unlock();
More information about the wine-cvs
mailing list