Paul Gofman : ddraw: Sync draw textures even for hardware device.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fffde3ca5210bc6e547e1dee0b0527829f4c2f33
URL:    https://gitlab.winehq.org/wine/wine/-/commit/fffde3ca5210bc6e547e1dee0b05278...

Author: Paul Gofman <pgofman(a)codeweavers.com>
Date:   Mon Dec  5 15:06:42 2022 -0600

ddraw: Sync draw textures even for hardware device.

Fixes a regression introduced by commit
d2d9f713df7932aac4b137ec3bf647d5da7faaef.

---

 dlls/ddraw/ddraw_private.h |  1 +
 dlls/ddraw/device.c        | 30 +++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 6693a650394..09e8133350b 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -328,6 +328,7 @@ struct d3d_device
     LONG ref;
     UINT version;
     BOOL hardware_device;
+    BOOL have_draw_textures;
 
     IUnknown *outer_unknown;
     struct wined3d_device *wined3d_device;
diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index ac6647b8dad..1cfef5007d5 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -3409,11 +3409,11 @@ void d3d_device_sync_surfaces(struct d3d_device *device)
     struct ddraw_surface *surface;
     unsigned int i, j;
 
-    if (device->hardware_device)
-        return;
-
     d3d_device_sync_rendertarget(device);
 
+    if (!device->have_draw_textures)
+        return;
+
     for (i = 0; i < ARRAY_SIZE(state->textures); ++i)
     {
         if (!state->textures[i])
@@ -4642,7 +4642,17 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
     TRACE("iface %p, stage %lu, texture %p.\n", iface, stage, texture);
 
     if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE))
-        wined3d_texture = surf->draw_texture ? surf->draw_texture : surf->wined3d_texture;
+    {
+        if (surf->draw_texture)
+        {
+            wined3d_texture = surf->draw_texture;
+            device->have_draw_textures = TRUE;
+        }
+        else
+        {
+            wined3d_texture = surf->wined3d_texture;
+        }
+    }
 
     wined3d_mutex_lock();
     wined3d_stateblock_set_texture(device->update_state, stage, wined3d_texture);
@@ -4682,7 +4692,17 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
     wined3d_mutex_lock();
 
     if (tex && ((tex->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) || !device->hardware_device))
-        wined3d_texture = tex->draw_texture ? tex->draw_texture : tex->wined3d_texture;
+    {
+        if (tex->draw_texture)
+        {
+            wined3d_texture = tex->draw_texture;
+            device->have_draw_textures = TRUE;
+        }
+        else
+        {
+            wined3d_texture = tex->wined3d_texture;
+        }
+    }
 
     wined3d_stateblock_set_texture(device->state, stage, wined3d_texture);
     fixup_texture_alpha_op(device);