[Mesa-stable] [PATCH] anv/blorp/clear_subpass: Only set surface clear color for fast clears

[Jason Ekstrand]

This patch is also needed for MSAA compression.

On Tue, Feb 21, 2017 at 7:31 PM, Jason Ekstrand <jason at jlekstrand.net>
wrote:

> Not all clear colors are valid.  In particular, on Broadwell and
> earlier, only 0/1 colors are allowed in surface state.  No CTS tests are
> affected outright by this because, apparently, the CTS coverage for
> different clear colors is pretty terrible.  However, when multisample
> compression is enabled, we do hit it with CTS tests and this commit
> prevents regressions when enabling MCS on Broadwell and earlier.
>
> Cc: "13.0 17.0" <mesa-stable at lists.freedesktop.org>
> ---
>  src/intel/vulkan/anv_blorp.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
> index 4e7078b..8db03e4 100644
> --- a/src/intel/vulkan/anv_blorp.c
> +++ b/src/intel/vulkan/anv_blorp.c
> @@ -1198,9 +1198,10 @@ anv_cmd_buffer_clear_subpass(struct anv_cmd_buffer
> *cmd_buffer)
>        struct blorp_surf surf;
>        get_blorp_surf_for_anv_image(image, VK_IMAGE_ASPECT_COLOR_BIT,
>                                     att_state->aux_usage, &surf);
> -      surf.clear_color = vk_to_isl_color(att_state->clear_value.color);
>
>        if (att_state->fast_clear) {
> +         surf.clear_color = vk_to_isl_color(att_state->
> clear_value.color);
> +
>           blorp_fast_clear(&batch, &surf, iview->isl.format,
>                            iview->isl.base_level,
>                            iview->isl.base_array_layer, fb->layers,
> @@ -1224,7 +1225,7 @@ anv_cmd_buffer_clear_subpass(struct anv_cmd_buffer
> *cmd_buffer)
>                       render_area.offset.x, render_area.offset.y,
>                       render_area.offset.x + render_area.extent.width,
>                       render_area.offset.y + render_area.extent.height,
> -                     surf.clear_color, NULL);
> +                     vk_to_isl_color(att_state->clear_value.color),
> NULL);
>        }
>
>        att_state->pending_clear_aspects = 0;
> --
> 2.5.0.400.gff86faf
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-stable/attachments/20170222/1d75bd41/attachment-0001.html>