[PATCH 0/2] MR3431: wined3d: Fix clears of the current render target in Vulkan

[Evan Tang (＠etang-cw)]

Previously, clearing the current render target would delay the clear until the render pass was ended by something else

Fixes missing UI in [Moving Out](https://store.steampowered.com/app/996770/Moving_Out/)

[PATCH 1/2] d3d11: Add tests for clearing RTs in the middle of a render

[Evan Tang]

From: Evan Tang

---
 dlls/d3d11/tests/d3d11.c | 174 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)

diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 61b83fc7cc4..4beced43dad 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -35100,6 +35100,179 @@ test_done:
     ok(!ref, "got %ld.\n", ref);
 }

+static void test_clear_during_render(void)
+{
+    static const D3D11_VIEWPORT viewport = {0, 0, 2, 1, 0, 1};
+    /* Quads only cover left half so we can see both drawn color on the left and clear color on the right */
+    static const struct vec3 depth_quarter_quad_data[] =
+    {
+        {-1.0f, -1.0f, 0.25f},
+        {-1.0f,  1.0f, 0.25f},
+        { 0.0f, -1.0f, 0.25f},
+        { 0.0f,  1.0f, 0.25f},
+    };
+    static const struct vec3 depth_three_quarter_quad_data[] =
+    {
+        {-1.0f, -1.0f, 0.75f},
+        {-1.0f,  1.0f, 0.75f},
+        { 0.0f, -1.0f, 0.75f},
+        { 0.0f,  1.0f, 0.75f},
+    };
+    static const struct vec4 draw_color_data = {1, 0, 0, 1};
+    struct d3d11_test_context test_context;
+    struct resource_readback rb;
+    ID3D11DeviceContext *context;
+    ID3D11Device *device;
+    ID3D11Texture2D *tex, *dstex;
+    ID3D11DepthStencilView *dsv;
+    ID3D11RenderTargetView *rtv;
+    ID3D11DepthStencilState *depth_none, *depth_ge, *depth_write_ge;
+    ID3D11Buffer *depth_quarter_quad, *depth_three_quarter_quad, *draw_color;
+    D3D11_DEPTH_STENCIL_DESC depth_stencil_desc;
+    D3D11_TEXTURE2D_DESC texture_desc;
+    HRESULT hr;
+    int test;
+
+    if (!init_test_context(&test_context, NULL))
+        return;
+
+    device = test_context.device;
+    context = test_context.immediate_context;
+    depth_quarter_quad = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(depth_quarter_quad_data), &depth_quarter_quad_data);
+    depth_three_quarter_quad = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(depth_three_quarter_quad_data), &depth_three_quarter_quad_data);
+    draw_color = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(draw_color_data), &draw_color_data);
+
+    memset(&depth_stencil_desc, 0, sizeof(depth_stencil_desc));
+    hr = ID3D11Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_none);
+    ok(hr == S_OK, "Failed to create depth none dss: %#lx\n", hr);
+    depth_stencil_desc.DepthEnable = TRUE;
+    depth_stencil_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;
+    depth_stencil_desc.DepthFunc = D3D11_COMPARISON_ALWAYS;
+    depth_stencil_desc.DepthFunc = D3D11_COMPARISON_GREATER_EQUAL;
+    hr = ID3D11Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_write_ge);
+    ok(hr == S_OK, "Failed to create depth write ge dss: %#lx\n", hr);
+    depth_stencil_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO;
+    hr = ID3D11Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_ge);
+    ok(hr == S_OK, "Failed to create depth ge dss: %#lx\n", hr);
+
+    memset(&texture_desc, 0, sizeof(texture_desc));
+    texture_desc.Width = (UINT)viewport.Width;
+    texture_desc.Height = (UINT)viewport.Height;
+    texture_desc.MipLevels = 1;
+    texture_desc.ArraySize = 1;
+    texture_desc.SampleDesc.Count = 1;
+    texture_desc.Usage = D3D11_USAGE_DEFAULT;
+    texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET;
+    texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+    hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &tex);
+    ok(hr == S_OK, "Failed to create color texture: %#lx\n", hr);
+    texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL;
+    texture_desc.Format = DXGI_FORMAT_D32_FLOAT;
+    hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &dstex);
+    ok(hr == S_OK, "Failed to create depth texture: %#lx\n", hr);
+    hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource*)tex, NULL, &rtv);
+    ok(hr == S_OK, "Failed to create rtv: %#lx\n", hr);
+    hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource*)dstex, NULL, &dsv);
+    ok(hr == S_OK, "Failed to create dsv: %#lx\n", hr);
+
+    for (test = 0; test < 5; test++)
+    {
+        unsigned int i;
+        static const UINT vertex_stride = sizeof(depth_quarter_quad_data[0]);
+        static const UINT vertex_offset = 0;
+        static const struct vec4 initial_color = {0, 0, 0, 1};
+        static const float clear_color[] = {0, 1, 0, 1};
+        DWORD expected_color[] = {0xff000000, 0xff000000};
+        FLOAT expected_depth[] = {0.5f, 0.5f};
+
+        ID3D11DeviceContext_RSSetViewports(context, 1, &viewport);
+        ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, dsv);
+        ID3D11DeviceContext_OMSetDepthStencilState(context, depth_none, 0);
+        ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.5f, 0);
+        draw_color_quad(&test_context, &initial_color);
+
+        /* We can't use draw_color_quad in here because the buffer updates it does can suppress bugs */
+        switch (test)
+        {
+            case 0:
+                /* Nothing, verify initial values */
+                break;
+            case 1:
+                /* Draw with succeeding depth compare */
+                ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.0f, 0);
+                ID3D11DeviceContext_OMSetDepthStencilState(context, depth_ge, 0);
+                ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &depth_quarter_quad, &vertex_stride, &vertex_offset);
+                ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &draw_color);
+                ID3D11DeviceContext_Draw(context, 4, 0);
+                expected_color[0] = 0xff0000ff;
+                expected_depth[0] = expected_depth[1] = 0.0f;
+                break;
+            case 2:
+                /* Draw with failing depth compare */
+                ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0);
+                ID3D11DeviceContext_OMSetDepthStencilState(context, depth_ge, 0);
+                ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &depth_three_quarter_quad, &vertex_stride, &vertex_offset);
+                ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &draw_color);
+                ID3D11DeviceContext_Draw(context, 4, 0);
+                expected_depth[0] = expected_depth[1] = 1.0f;
+                break;
+            case 3:
+                /* Draw with depth write */
+                ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.0f, 0);
+                ID3D11DeviceContext_OMSetDepthStencilState(context, depth_write_ge, 0);
+                ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &depth_quarter_quad, &vertex_stride, &vertex_offset);
+                ID3D11DeviceContext_PSSetShader(context, NULL, NULL, 0);
+                ID3D11DeviceContext_Draw(context, 4, 0);
+                expected_depth[0] = 0.25f;
+                expected_depth[1] = 0.0f;
+                break;
+            case 4:
+                /* Color write */
+                ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color);
+                ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &depth_quarter_quad, &vertex_stride, &vertex_offset);
+                ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &draw_color);
+                ID3D11DeviceContext_Draw(context, 4, 0);
+                expected_color[0] = 0xff0000ff;
+                expected_color[1] = 0xff00ff00;
+                break;
+            default:
+                break;
+        }
+
+        get_texture_readback(tex, 0, &rb);
+        for (i = 0; i < ARRAYSIZE(expected_color); i++)
+        {
+            DWORD color = get_readback_color(&rb, i, 0, 0);
+            todo_wine_if(
+                (damavand && ((test == 1 || test == 2) && i == 0) || (test == 4 && i == 1)) ||
+                (!damavand && test == 3 && i == 0) /* Draw with no PS doesn't write color on D3D11 but does on OpenGL */
+            )
+            ok(color == expected_color[i], "Test %d: Got unexpected color 0x%08lx at %u\n", test, color, i);
+        }
+        release_resource_readback(&rb);
+        get_texture_readback(dstex, 0, &rb);
+        for (i = 0; i < ARRAYSIZE(expected_depth); i++)
+        {
+            FLOAT depth = get_readback_float(&rb, i, 0);
+            todo_wine_if(damavand && test == 3)
+            ok(depth == expected_depth[i], "Test %d: Got unexpected depth %.2f at %u\n", test, depth, i);
+        }
+        release_resource_readback(&rb);
+    }
+
+    ID3D11Buffer_Release(depth_quarter_quad);
+    ID3D11Buffer_Release(depth_three_quarter_quad);
+    ID3D11Buffer_Release(draw_color);
+    ID3D11RenderTargetView_Release(rtv);
+    ID3D11DepthStencilView_Release(dsv);
+    ID3D11Texture2D_Release(tex);
+    ID3D11Texture2D_Release(dstex);
+    ID3D11DepthStencilState_Release(depth_none);
+    ID3D11DepthStencilState_Release(depth_ge);
+    ID3D11DepthStencilState_Release(depth_write_ge);
+    release_test_context(&test_context);
+}
+
 START_TEST(d3d11)
 {
     unsigned int argc, i;
@@ -35295,6 +35468,7 @@ START_TEST(d3d11)
     queue_test(test_vertex_formats);
     queue_test(test_dxgi_resources);
     queue_for_each_feature_level(test_shared_resource);
+    queue_test(test_clear_during_render);

run_queued_tests();

[PATCH 2/2] wined3d: Restart vk render pass on RT clear

[Evan Tang]

From: Evan Tang

---
 dlls/d3d11/tests/d3d11.c  |  6 +-----
 dlls/wined3d/context_vk.c | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 4beced43dad..cd59291dd9e 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -35243,10 +35243,7 @@ static void test_clear_during_render(void)
         for (i = 0; i < ARRAYSIZE(expected_color); i++)
         {
             DWORD color = get_readback_color(&rb, i, 0, 0);
-            todo_wine_if(
-                (damavand && ((test == 1 || test == 2) && i == 0) || (test == 4 && i == 1)) ||
-                (!damavand && test == 3 && i == 0) /* Draw with no PS doesn't write color on D3D11 but does on OpenGL */
-            )
+            todo_wine_if(!damavand && test == 3 && i == 0) /* Draw with no PS doesn't write color on D3D11 but does on OpenGL */
             ok(color == expected_color[i], "Test %d: Got unexpected color 0x%08lx at %u\n", test, color, i);
         }
         release_resource_readback(&rb);
@@ -35254,7 +35251,6 @@ static void test_clear_during_render(void)
         for (i = 0; i < ARRAYSIZE(expected_depth); i++)
         {
             FLOAT depth = get_readback_float(&rb, i, 0);
-            todo_wine_if(damavand && test == 3)
             ok(depth == expected_depth[i], "Test %d: Got unexpected depth %.2f at %u\n", test, depth, i);
         }
         release_resource_readback(&rb);
diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c
index efc18e2ff69..7e6fb72c42c 100644
--- a/dlls/wined3d/context_vk.c
+++ b/dlls/wined3d/context_vk.c
@@ -3505,6 +3505,20 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk *
     }
 }

+static void wined3d_context_prepare_used_framebuffer(struct wined3d_rendertarget_view *rtv, struct wined3d_context *context)
+{
+    if (wined3d_rendertarget_view_get_locations(rtv) & WINED3D_LOCATION_CLEARED)
+    {
+        /* Need to rebind framebuffer or the clear won't happen */
+        context_invalidate_state(context, STATE_FRAMEBUFFER);
+        wined3d_rendertarget_view_prepare_location(rtv, context, rtv->resource->draw_binding);
+    }
+    else
+    {
+        wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding);
+    }
+}
+
 VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *context_vk,
         const struct wined3d_state *state, struct wined3d_buffer_vk *indirect_vk, bool indexed)
 {
@@ -3548,10 +3562,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c
         {
             /* We handle clears at the beginning of the render pass, no need for an explicit clear
              * first. */
-            if (wined3d_rendertarget_view_get_locations(rtv) & WINED3D_LOCATION_CLEARED)
-                wined3d_rendertarget_view_prepare_location(rtv, &context_vk->c, rtv->resource->draw_binding);
-            else
-                wined3d_rendertarget_view_load_location(rtv, &context_vk->c, rtv->resource->draw_binding);
+            wined3d_context_prepare_used_framebuffer(rtv, &context_vk->c);
             invalidate_rt |= (1 << i);
         }
         else
@@ -3569,16 +3580,9 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c
     if ((dsv = state->fb.depth_stencil))
     {
         if (wined3d_state_uses_depth_buffer(state))
-        {
-            if (wined3d_rendertarget_view_get_locations(dsv) & WINED3D_LOCATION_CLEARED)
-                wined3d_rendertarget_view_prepare_location(dsv, &context_vk->c, dsv->resource->draw_binding);
-            else
-                wined3d_rendertarget_view_load_location(dsv, &context_vk->c, dsv->resource->draw_binding);
-        }
+            wined3d_context_prepare_used_framebuffer(dsv, &context_vk->c);
         else
-        {
             wined3d_rendertarget_view_prepare_location(dsv, &context_vk->c, dsv->resource->draw_binding);
-        }

if (!state->depth_stencil_state || state->depth_stencil_state->writes_ds)
             invalidate_ds = true;

[PATCH 2/2] wined3d: Restart vk render pass on RT clear

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=135341

Your paranoid android.

=== debian11 (32 bit zh:CN report) ===

Report validation errors:
d3d11:d3d11 crashed (c0000005)