Zebediah Figura : ddraw: Read the current RTV before flipping any surfaces.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3b5dca348e12f65f3a92313f207fc004ab5eb33c
URL:    https://gitlab.winehq.org/wine/wine/-/commit/3b5dca348e12f65f3a92313f207fc00...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Wed Nov 22 17:04:18 2023 -0600

ddraw: Read the current RTV before flipping any surfaces.

Since we rename one at a time, we will swap the RTV twice otherwise.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54839
Fixes: f103da7c69cc18aaf63f08a752d870b7049d9d20

---

 dlls/ddraw/surface.c      | 14 +++++++-------
 dlls/ddraw/tests/ddraw7.c |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index ef82a5bfac5..5836a49f4fd 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1330,15 +1330,14 @@ static unsigned int ddraw_swap_interval_from_flags(DWORD flags)
 }
 
 static void ddraw_texture_rename_to(struct ddraw_texture *dst_texture, struct wined3d_texture *wined3d_texture,
-        struct wined3d_texture *draw_texture, struct wined3d_rendertarget_view *rtv, void *texture_memory)
+        struct wined3d_texture *draw_texture, struct wined3d_rendertarget_view *rtv, void *texture_memory,
+        struct wined3d_rendertarget_view *current_rtv)
 {
     struct ddraw_surface *dst_surface = dst_texture->root;
-    struct wined3d_rendertarget_view *current_rtv;
 
     /* We don't have to worry about potential texture bindings, since
      * flippable surfaces can never be textures. */
 
-    current_rtv = wined3d_device_context_get_rendertarget_view(dst_surface->ddraw->immediate_context, 0);
     if (current_rtv == dst_surface->wined3d_rtv)
         wined3d_device_context_set_rendertarget_views(dst_surface->ddraw->immediate_context, 0, 1, &rtv, FALSE);
     wined3d_rendertarget_view_set_parent(rtv, dst_surface, &ddraw_view_wined3d_parent_ops);
@@ -1377,8 +1376,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *
     struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface);
     struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src);
     struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture;
+    struct wined3d_rendertarget_view *tmp_rtv, *current_rtv;
     struct wined3d_texture *texture, *draw_texture;
-    struct wined3d_rendertarget_view *tmp_rtv;
     DDSCAPS caps = {DDSCAPS_FLIP};
     IDirectDrawSurface *current;
     void *texture_memory;
@@ -1407,6 +1406,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *
     dst_ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture);
     texture_memory = dst_ddraw_texture->texture_memory;
     draw_texture = dst_impl->draw_texture;
+    current_rtv = wined3d_device_context_get_rendertarget_view(dst_impl->ddraw->immediate_context, 0);
 
     if (src_impl)
     {
@@ -1430,7 +1430,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *
         src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture);
 
         ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture,
-                ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory);
+                ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory, current_rtv);
 
         dst_ddraw_texture = src_ddraw_texture;
     }
@@ -1455,14 +1455,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *
             src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture);
 
             ddraw_texture_rename_to(dst_ddraw_texture, src_impl->wined3d_texture, src_impl->draw_texture,
-                    ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory);
+                    ddraw_surface_get_rendertarget_view(src_impl), src_ddraw_texture->texture_memory, current_rtv);
 
             dst_ddraw_texture = src_ddraw_texture;
             dst_impl = src_impl;
         }
     }
 
-    ddraw_texture_rename_to(dst_ddraw_texture, texture, draw_texture, tmp_rtv, texture_memory);
+    ddraw_texture_rename_to(dst_ddraw_texture, texture, draw_texture, tmp_rtv, texture_memory, current_rtv);
 
     if (flags & ~(DDFLIP_NOVSYNC | DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4))
     {
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index dc9568a1143..2771a4ed368 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -19981,10 +19981,10 @@ static void test_flip_3d(void)
     draw_color_quad(&context, 0x000000ff);
 
     color = get_surface_color(buffers[0], 0, 0);
-    todo_wine ok(color == 0x000000ff, "Got unexpected colour 0x%08x.\n", color);
+    ok(color == 0x000000ff, "Got unexpected colour 0x%08x.\n", color);
 
     color = get_surface_color(buffers[3], 0, 0);
-    todo_wine ok(color == 0x0000ff00, "Got unexpected colour 0x%08x.\n", color);
+    ok(color == 0x0000ff00, "Got unexpected colour 0x%08x.\n", color);
 
     for (unsigned int i = 0; i < ARRAY_SIZE(buffers); ++i)
         IDirectDrawSurface7_Release(buffers[ARRAY_SIZE(buffers) - 1 - i]);