Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetTexture().

Alexandre Julliard julliard at winehq.org
Mon Oct 28 16:43:36 CDT 2019


Module: wine
Branch: master
Commit: d4cfa070cb9428b9954de26bb704cf5d4b8e9cd5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d4cfa070cb9428b9954de26bb704cf5d4b8e9cd5

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Oct 24 13:43:10 2019 -0500

ddraw: Handle stateblocks in d3d_device7_SetTexture().

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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index 3702454bde..9b7754bd8d 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -4811,7 +4811,9 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
         wined3d_texture = surf->wined3d_texture;
 
     wined3d_mutex_lock();
-    wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture);
+    wined3d_stateblock_set_texture(device->update_state, stage, wined3d_texture);
+    if (!device->recording)
+        wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture);
     wined3d_mutex_unlock();
 
     return D3D_OK;




More information about the wine-cvs mailing list