[Mesa-stable] [Mesa-dev] [PATCH] radv: restore previous stencil reference after depth-stencil clear

[Samuel Pitoiset]

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

On 01/19/2018 03:11 PM, Matthew Nicholls wrote:
> Cc: mesa-stable at lists.freedesktop.org
> ---
>   src/amd/vulkan/radv_meta_clear.c | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c
> index b42ecedfc9..98fb8fa6a7 100644
> --- a/src/amd/vulkan/radv_meta_clear.c
> +++ b/src/amd/vulkan/radv_meta_clear.c
> @@ -624,6 +624,7 @@ emit_depthstencil_clear(struct radv_cmd_buffer *cmd_buffer,
>   			      VK_SHADER_STAGE_VERTEX_BIT, 0, 4,
>   			      &clear_value.depth);
>   
> +	uint32_t prev_reference = cmd_buffer->state.dynamic.stencil_reference.front;
>   	if (aspects & VK_IMAGE_ASPECT_STENCIL_BIT) {
>   		radv_CmdSetStencilReference(cmd_buffer_h, VK_STENCIL_FACE_FRONT_BIT,
>   						  clear_value.stencil);
> @@ -658,6 +659,11 @@ emit_depthstencil_clear(struct radv_cmd_buffer *cmd_buffer,
>   	radv_CmdSetScissor(radv_cmd_buffer_to_handle(cmd_buffer), 0, 1, &clear_rect->rect);
>   
>   	radv_CmdDraw(cmd_buffer_h, 3, clear_rect->layerCount, 0, clear_rect->baseArrayLayer);
> +
> +	if (aspects & VK_IMAGE_ASPECT_STENCIL_BIT) {
> +		radv_CmdSetStencilReference(cmd_buffer_h, VK_STENCIL_FACE_FRONT_BIT,
> +						  prev_reference);
> +	}
>   }
>   
>   static bool
>