From: Matthew Nicholls Date: Fri, 19 Jan 2018 14:11:48 +0000 (+0000) Subject: radv: restore previous stencil reference after depth-stencil clear X-Git-Tag: upstream/18.1.0~2477 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=005375717b18b2eb04bdc54a260b096cabab15d2;p=platform%2Fupstream%2Fmesa.git radv: restore previous stencil reference after depth-stencil clear Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Samuel Pitoiset Reviewed-by: Alex Smith --- diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index b42eced..98fb8fa 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