[PATCH v7 0/2] MR3431: wined3d: Fix clears of the current render target in Vulkan
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/) -- v7: wined3d: Restart vk render pass on RT clear. https://gitlab.winehq.org/wine/wine/-/merge_requests/3431
From: Evan Tang <etang(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 185 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b144fb36aca..452045852c4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -35266,6 +35266,190 @@ static void test_keyed_mutex(void) ok(!ref, "got %ld.\n", ref); } +static void test_clear_during_render(void) +{ + /* 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}; + 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}; + D3D11_VIEWPORT viewport = {0, 0, 0, 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; + DWORD color; + float depth; + + 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 = 2; + texture_desc.Height = 1; + 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); + viewport.Width = (float)texture_desc.Width; + viewport.Height = (float)texture_desc.Height; + ID3D11DeviceContext_RSSetViewports(context, 1, &viewport); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, dsv); + + /* Draw with succeeding depth compare. */ + ID3D11DeviceContext_OMSetDepthStencilState(context, depth_none, 0); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.5f, 0); + draw_color_quad(&test_context, &initial_color); + 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); + get_texture_readback(tex, 0, &rb); + color = get_readback_color(&rb, 0, 0, 0); + todo_wine_if(damavand) + ok(color == 0xff0000ff, "Got unexpected color 0x%08lx instead of 0xff0000ff.\n", color); + color = get_readback_color(&rb, 1, 0, 0); + ok(color == 0xff000000, "Got unexpected color 0x%08lx instead of 0xff000000.\n", color); + release_resource_readback(&rb); + get_texture_readback(dstex, 0, &rb); + depth = get_readback_float(&rb, 0, 0); + ok(depth == 0.0f, "Got unexpected depth %.8e instead of 0.0.\n", depth); + depth = get_readback_float(&rb, 1, 0); + ok(depth == 0.0f, "Got unexpected depth %.8e instead of 0.0.\n", depth); + release_resource_readback(&rb); + + /* Draw with failing depth compare. */ + ID3D11DeviceContext_OMSetDepthStencilState(context, depth_none, 0); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.5f, 0); + draw_color_quad(&test_context, &initial_color); + 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); + get_texture_readback(tex, 0, &rb); + color = get_readback_color(&rb, 0, 0, 0); + todo_wine_if(damavand) + ok(color == 0xff000000, "Got unexpected color 0x%08lx instead of 0xff000000.\n", color); + color = get_readback_color(&rb, 1, 0, 0); + ok(color == 0xff000000, "Got unexpected color 0x%08lx instead of 0xff000000.\n", color); + release_resource_readback(&rb); + get_texture_readback(dstex, 0, &rb); + depth = get_readback_float(&rb, 0, 0); + ok(depth == 1.0f, "Got unexpected depth %.8e instead of 1.0.\n", depth); + depth = get_readback_float(&rb, 1, 0); + ok(depth == 1.0f, "Got unexpected depth %.8e instead of 1.0.\n", depth); + release_resource_readback(&rb); + + /* Draw with depth write. */ + ID3D11DeviceContext_OMSetDepthStencilState(context, depth_none, 0); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.5f, 0); + draw_color_quad(&test_context, &initial_color); + 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); + get_texture_readback(tex, 0, &rb); + color = get_readback_color(&rb, 0, 0, 0); + todo_wine_if(!damavand) /* Draw with no PS doesn't write color on D3D11 but does on OpenGL. */ + ok(color == 0xff000000, "Got unexpected color 0x%08lx instead of 0xff000000.\n", color); + color = get_readback_color(&rb, 1, 0, 0); + ok(color == 0xff000000, "Got unexpected color 0x%08lx instead of 0xff000000.\n", color); + release_resource_readback(&rb); + get_texture_readback(dstex, 0, &rb); + depth = get_readback_float(&rb, 0, 0); + todo_wine_if(damavand) + ok(depth == 0.25f, "Got unexpected depth %.8e instead of 0.25.\n", depth); + depth = get_readback_float(&rb, 1, 0); + todo_wine_if(damavand) + ok(depth == 0.0f, "Got unexpected depth %.8e instead of 0.0.\n", depth); + release_resource_readback(&rb); + + /* Draw with color write. */ + ID3D11DeviceContext_OMSetDepthStencilState(context, depth_none, 0); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.5f, 0); + draw_color_quad(&test_context, &initial_color); + 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); + get_texture_readback(tex, 0, &rb); + color = get_readback_color(&rb, 0, 0, 0); + ok(color == 0xff0000ff, "Got unexpected color 0x%08lx instead of 0xff0000ff.\n", color); + color = get_readback_color(&rb, 1, 0, 0); + todo_wine_if(damavand) + ok(color == 0xff00ff00, "Got unexpected color 0x%08lx instead of 0xff00ff00.\n", color); + 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; @@ -35462,6 +35646,7 @@ START_TEST(d3d11) queue_test(test_dxgi_resources); queue_for_each_feature_level(test_shared_resource); queue_test(test_keyed_mutex); + queue_test(test_clear_during_render); run_queued_tests(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3431
From: Evan Tang <etang(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 5 ----- dlls/wined3d/context_vk.c | 28 ++++++++++++++++------------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 452045852c4..cd36780ddcd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -35361,7 +35361,6 @@ static void test_clear_during_render(void) ID3D11DeviceContext_Draw(context, 4, 0); get_texture_readback(tex, 0, &rb); color = get_readback_color(&rb, 0, 0, 0); - todo_wine_if(damavand) ok(color == 0xff0000ff, "Got unexpected color 0x%08lx instead of 0xff0000ff.\n", color); color = get_readback_color(&rb, 1, 0, 0); ok(color == 0xff000000, "Got unexpected color 0x%08lx instead of 0xff000000.\n", color); @@ -35384,7 +35383,6 @@ static void test_clear_during_render(void) ID3D11DeviceContext_Draw(context, 4, 0); get_texture_readback(tex, 0, &rb); color = get_readback_color(&rb, 0, 0, 0); - todo_wine_if(damavand) ok(color == 0xff000000, "Got unexpected color 0x%08lx instead of 0xff000000.\n", color); color = get_readback_color(&rb, 1, 0, 0); ok(color == 0xff000000, "Got unexpected color 0x%08lx instead of 0xff000000.\n", color); @@ -35414,10 +35412,8 @@ static void test_clear_during_render(void) release_resource_readback(&rb); get_texture_readback(dstex, 0, &rb); depth = get_readback_float(&rb, 0, 0); - todo_wine_if(damavand) ok(depth == 0.25f, "Got unexpected depth %.8e instead of 0.25.\n", depth); depth = get_readback_float(&rb, 1, 0); - todo_wine_if(damavand) ok(depth == 0.0f, "Got unexpected depth %.8e instead of 0.0.\n", depth); release_resource_readback(&rb); @@ -35433,7 +35429,6 @@ static void test_clear_during_render(void) color = get_readback_color(&rb, 0, 0, 0); ok(color == 0xff0000ff, "Got unexpected color 0x%08lx instead of 0xff0000ff.\n", color); color = get_readback_color(&rb, 1, 0, 0); - todo_wine_if(damavand) ok(color == 0xff00ff00, "Got unexpected color 0x%08lx instead of 0xff00ff00.\n", color); release_resource_readback(&rb); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 859e8fb5949..f9ac0a59707 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -3565,6 +3565,20 @@ static void wined3d_context_vk_load_shader_resources(struct wined3d_context_vk * } } +static void wined3d_context_vk_prepare_used_rtv(struct wined3d_context_vk *context_vk, struct wined3d_rendertarget_view *rtv) +{ + if (wined3d_rendertarget_view_get_locations(rtv) & WINED3D_LOCATION_CLEARED) + { + /* Need to restart render pass or the clear won't happen. */ + wined3d_context_vk_end_current_render_pass(context_vk); + 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); + } +} + 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) { @@ -3607,10 +3621,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_vk_prepare_used_rtv(context_vk, rtv); invalidate_rt |= (1 << i); } else @@ -3628,16 +3639,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_vk_prepare_used_rtv(context_vk, dsv); 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; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3431
On Fri Aug 18 00:04:34 2023 +0000, Henri Verbeet wrote:
I imagine we instead get validation layer errors from this with the Vulkan backend?
Vulkan has no problems running with no fragment shader, the only validation layer errors I'm getting are about not properly respecting values reported by `VkMemoryRequirements::alignment`. I would have expected a fragment shader to be required unless "rasterizerDiscardEnable" was enabled, but it looks like it's indeed not. However, the spec does say this: "If a fragment shader is omitted, fragment color outputs have undefined values, and the fragment depth value is unmodified." That may match d3d11 (would have to look that up), but it's not quite the same as the behaviour expected by the test. In any case, it shouldn't be too hard to fix GL, just link in an essentially empty fragment shader. That doesn't need to be in this MR, and I could look into it myself if you prefer, but it may be something nice and small to fix. ```diff + /* Need to restart render pass or the clear won't happen. */ + context_invalidate_state(context, STATE_FRAMEBUFFER); ``` So why are we invalidating STATE_FRAMEBUFFER instead of calling wined3d_context_vk_end_current_render_pass()? :) (Sure, it'll have the same effect; there's a conceptual difference though.) Yeah, wined3d_context_vk_end_current_render_pass would probably be better here, especially if we add optimizations to avoid render pass restarts later
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3431#note_42668
participants (2)
-
Evan Tang -
Evan Tang (＠etang-cw)