Module: Mesa Branch: master Commit: c1a2ac2abe97ec30706d035e8838df1c7a7da665 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1a2ac2abe97ec30706d035e8838df1c7a7da665
Author: Caio Marcelo de Oliveira Filho <[email protected]> Date: Fri Jan 24 11:11:20 2020 -0800 anv: Always initialize target_stencil_layout Pass down stencil data from the subpass attachment like we do elsewhere. Only stencil attachments will make use of it. Fixes warnings like ../src/intel/vulkan/genX_cmd_buffer.c: In function ‘cmd_buffer_begin_subpass’: ../src/intel/vulkan/genX_cmd_buffer.c:4656:41: warning: ‘target_stencil_layout’ may be used uninitialized in this function [-Wmaybe-uninitialized] 4656 | att_state->current_stencil_layout = target_stencil_layout; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ Reviewed-by: Jason Ekstrand <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3557> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3557> --- src/intel/vulkan/genX_cmd_buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 55697657505..5fbdf93afbd 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -4625,7 +4625,7 @@ cmd_buffer_begin_subpass(struct anv_cmd_buffer *cmd_buffer, (att_state->fast_clear && !att_state->clear_color_is_zero_one) || att_state->input_aux_usage != att_state->aux_usage; - VkImageLayout target_layout, target_stencil_layout; + VkImageLayout target_layout; if (iview->aspect_mask & VK_IMAGE_ASPECT_ANY_COLOR_BIT_ANV && !input_needs_resolve) { /* Layout transitions before the final only help to enable sampling @@ -4636,9 +4636,11 @@ cmd_buffer_begin_subpass(struct anv_cmd_buffer *cmd_buffer, target_layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; } else { target_layout = subpass->attachments[i].layout; - target_stencil_layout = subpass->attachments[i].stencil_layout; } + VkImageLayout target_stencil_layout = + subpass->attachments[i].stencil_layout; + uint32_t base_layer, layer_count; if (image->type == VK_IMAGE_TYPE_3D) { base_layer = 0; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
