From 92c179f52aa4541a3433529260d129ee7e1c648b Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Fri, 24 Jul 2020 21:56:04 +0200 Subject: [PATCH] radv: Fix uninitialized variable in renderpass. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes some dEQP-VK.renderpass2.* flakes. Valgrind: Test case 'dEQP-VK.renderpass2.dedicated_allocation.attachment.8.724'.. ==754520== Conditional jump or move depends on uninitialised value(s) ==754520== at 0x575B21C: radv_layout_is_htile_compressed (radv_image.c:1690) ==754520== by 0x572F470: radv_handle_depth_image_transition (radv_cmd_buffer.c:5855) ==754520== by 0x572F2F2: radv_handle_image_transition (radv_cmd_buffer.c:6123) ==754520== by 0x572EEC6: radv_handle_subpass_image_transition (radv_cmd_buffer.c:3385) ==754520== by 0x572A104: radv_cmd_buffer_begin_subpass (radv_cmd_buffer.c:4843) ==754520== by 0x572A007: radv_CmdBeginRenderPass (radv_cmd_buffer.c:4913) ==754520== by 0x572A197: radv_CmdBeginRenderPass2 (radv_cmd_buffer.c:4921) Why false? A renderloop happens when the same attachment is both used as input attachment and output (color, ds) attachment in a subpass. Of course this doesn't happen outside of a renderpass and hence we can initialize it to false at the start of the renderpass. Fixes: 66131ceb8bc "radv: Pass through render loop detection to internal layout decisions." Reviewed-by: Samuel Pitoiset Reviewed-by: Daniel Schürmann Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3074 Part-of: (cherry picked from commit 18fe130ec9e07213c5b4e1e46232e3c3c1835057) --- .pick_status.json | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 7fc2072923e..d1f17e3ac26 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3145,7 +3145,7 @@ "description": "radv: Fix uninitialized variable in renderpass.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "66131ceb8bc9f3a3e17a73d90ef520694e3b50b6" }, diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 66f80e459f9..ab1e1a6d2c8 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3300,6 +3300,7 @@ radv_cmd_state_setup_attachments(struct radv_cmd_buffer *cmd_buffer, } state->attachments[i].current_layout = att->initial_layout; + state->attachments[i].current_in_render_loop = false; state->attachments[i].current_stencil_layout = att->stencil_initial_layout; state->attachments[i].sample_location.count = 0;