[Mesa-dev] [PATCH v2 1/9] radv: rename has_resolve to has_resolve_color

[Bas Nieuwenhuizen]

Please fix the title to use the correct variable name. Otherwise r-b

On Wed, Jun 12, 2019, 11:44 AM Samuel Pitoiset <samuel.pitoiset at gmail.com>
wrote:

> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/amd/vulkan/radv_meta_resolve.c | 2 +-
>  src/amd/vulkan/radv_pass.c         | 4 ++--
>  src/amd/vulkan/radv_private.h      | 4 ++--
>  3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/amd/vulkan/radv_meta_resolve.c
> b/src/amd/vulkan/radv_meta_resolve.c
> index 8c4bfa63ac7..5027bfdb93b 100644
> --- a/src/amd/vulkan/radv_meta_resolve.c
> +++ b/src/amd/vulkan/radv_meta_resolve.c
> @@ -621,7 +621,7 @@ radv_cmd_buffer_resolve_subpass(struct radv_cmd_buffer
> *cmd_buffer)
>         struct radv_meta_saved_state saved_state;
>         enum radv_resolve_method resolve_method = RESOLVE_HW;
>
> -       if (!subpass->has_resolve)
> +       if (!subpass->has_color_resolve)
>                 return;
>
>         for (uint32_t i = 0; i < subpass->color_count; ++i) {
> diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c
> index 8fa098eaac8..728b6113206 100644
> --- a/src/amd/vulkan/radv_pass.c
> +++ b/src/amd/vulkan/radv_pass.c
> @@ -132,7 +132,7 @@ radv_render_pass_compile(struct radv_render_pass *pass)
>                                                  depth_sample_count);
>
>                 /* We have to handle resolve attachments specially */
> -               subpass->has_resolve = false;
> +               subpass->has_color_resolve = false;
>                 if (subpass->resolve_attachments) {
>                         for (uint32_t j = 0; j < subpass->color_count;
> j++) {
>                                 struct radv_subpass_attachment
> *resolve_att =
> @@ -141,7 +141,7 @@ radv_render_pass_compile(struct radv_render_pass *pass)
>                                 if (resolve_att->attachment ==
> VK_ATTACHMENT_UNUSED)
>                                         continue;
>
> -                               subpass->has_resolve = true;
> +                               subpass->has_color_resolve = true;
>                         }
>                 }
>         }
> diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
> index 8f2e80b3017..848fd427ef0 100644
> --- a/src/amd/vulkan/radv_private.h
> +++ b/src/amd/vulkan/radv_private.h
> @@ -1910,8 +1910,8 @@ struct radv_subpass {
>         struct radv_subpass_attachment *             resolve_attachments;
>         struct radv_subpass_attachment *
>  depth_stencil_attachment;
>
> -       /** Subpass has at least one resolve attachment */
> -       bool                                         has_resolve;
> +       /** Subpass has at least one color resolve attachment */
> +       bool                                         has_color_resolve;
>
>         /** Subpass has at least one color attachment */
>         bool                                         has_color_att;
> --
> 2.22.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20190620/690c13d1/attachment.html>