[PATCH 0/2] MR4478: ddraw: Read the current RTV before flipping any surfaces.

[PATCH 1/2] ddraw/tests: Add a test for drawing to a flippable surface.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/ddraw/tests/ddraw7.c | 103 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index ab43c1bbb2d..dc9568a1143 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -641,6 +641,29 @@ static bool init_3d_test_context_guid(struct ddraw_test_context *context, const
     return true;
 }

+static bool init_3d_test_context(struct ddraw_test_context *context)
+{
+    HRESULT hr;
+
+    memset(context, 0, sizeof(*context));
+
+    context->window = create_window();
+    if (!(context->device = create_device(context->window, DDSCL_NORMAL)))
+    {
+        skip("Failed to create a D3D device.\n");
+        DestroyWindow(context->window);
+        return false;
+    }
+
+    hr = IDirect3DDevice7_GetDirect3D(context->device, &context->d3d);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    hr = IDirect3D7_QueryInterface(context->d3d, &IID_IDirectDraw7, (void **)&context->ddraw);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    hr = IDirect3DDevice7_GetRenderTarget(context->device, &context->backbuffer);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    return true;
+}
+
 #define release_test_context(a) release_test_context_(__LINE__, a)
 static void release_test_context_(unsigned int line, struct ddraw_test_context *context)
 {
@@ -665,6 +688,36 @@ static void clear_surface(IDirectDrawSurface7 *surface, unsigned int colour)
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
 }

+static void draw_color_quad(struct ddraw_test_context *context, unsigned int colour)
+{
+    IDirect3DDevice7 *device = context->device;
+    HRESULT hr;
+
+    struct
+    {
+        struct vec3 position;
+        unsigned int colour;
+    }
+    quad[] =
+    {
+        {{-1.0f, -1.0f, 0.0f}, colour},
+        {{-1.0f,  1.0f, 0.0f}, colour},
+        {{ 1.0f, -1.0f, 0.0f}, colour},
+        {{ 1.0f,  1.0f, 0.0f}, colour},
+    };
+
+    hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, FALSE);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    hr = IDirect3DDevice7_BeginScene(device);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, 4, 0);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    hr = IDirect3DDevice7_EndScene(device);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+}
+
 struct message
 {
     UINT message;
@@ -19889,6 +19942,55 @@ static void test_user_memory(const GUID *device_guid)
     release_test_context(&context);
 }

+/* Test that we handle flipping correctly when drawing to a flippable surface. */
+static void test_flip_3d(void)
+{
+    struct ddraw_test_context context;
+    IDirectDrawSurface7 *buffers[4];
+    DDSURFACEDESC2 desc;
+    unsigned int color;
+    HRESULT hr;
+
+    if (!init_3d_test_context(&context))
+        return;
+
+    reset_ddsd(&desc);
+    desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_BACKBUFFERCOUNT;
+    desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE | DDSCAPS_FLIP | DDSCAPS_COMPLEX;
+    desc.dwBackBufferCount = ARRAY_SIZE(buffers) - 1;
+    desc.dwWidth = 16;
+    desc.dwHeight = 16;
+    hr = IDirectDraw7_CreateSurface(context.ddraw, &desc, &buffers[0], NULL);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+
+    for (unsigned int i = 0; i < ARRAY_SIZE(buffers) - 1; ++i)
+    {
+        DDSCAPS2 backbuffer_caps = {DDSCAPS_FLIP};
+
+        hr = IDirectDrawSurface7_GetAttachedSurface(buffers[i], &backbuffer_caps, &buffers[i + 1]);
+        ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    }
+
+    hr = IDirect3DDevice7_SetRenderTarget(context.device, buffers[0], 0);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
+
+    draw_color_quad(&context, 0x0000ff00);
+
+    hr = IDirectDrawSurface7_Flip(buffers[0], NULL, DDFLIP_WAIT);
+
+    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);
+
+    color = get_surface_color(buffers[3], 0, 0);
+    todo_wine 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]);
+    release_test_context(&context);
+}
+
 static void run_for_each_device_type(void (*test_func)(const GUID *))
 {
     winetest_push_context("Hardware device");
@@ -20073,4 +20175,5 @@ START_TEST(ddraw7)
     test_filling_convention();
     test_enum_devices();
     run_for_each_device_type(test_user_memory);
+    test_flip_3d();
 }

[PATCH 2/2] ddraw: Read the current RTV before flipping any surfaces.

[Zebediah Figura]

From: Zebediah Figura

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]);

[PATCH 0/2] MR4478: ddraw: Read the current RTV before flipping any surfaces. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.