diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2018-06-25 13:34:10 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-06-25 08:39:18 -0700 |
| commit | b5f154a86055a3e804aef81a5c26bd7b2f7eb5d6 (patch) | |
| tree | ecefdf049063107e5a24d4d4d58136ce3d661516 | |
| parent | fc0d0ad01944e1ef6c7d93234a604c02464aafb1 (diff) | |
radv: fix HTILE metadata initialization in presence of subpass clears
If the driver ends up by performing a slow depthstencil clear,
the HTILE metadata won't be initialized correctly.
This fixes random VM faults on Polaris while running CTS
with Bas's runner. This doesn't seem to regress performance.
CC: <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
(cherry picked from commit 07cb1373a23042de6904e918419bfa3963695795)
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index eff269d188..f9e792fde2 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3828,14 +3828,7 @@ static void radv_handle_depth_image_transition(struct radv_cmd_buffer *cmd_buffe if (!radv_image_has_htile(image)) return; - if (dst_layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL && - (pending_clears & vk_format_aspects(image->vk_format)) == vk_format_aspects(image->vk_format) && - cmd_buffer->state.render_area.offset.x == 0 && cmd_buffer->state.render_area.offset.y == 0 && - cmd_buffer->state.render_area.extent.width == image->info.width && - cmd_buffer->state.render_area.extent.height == image->info.height) { - /* The clear will initialize htile. */ - return; - } else if (src_layout == VK_IMAGE_LAYOUT_UNDEFINED && + if (src_layout == VK_IMAGE_LAYOUT_UNDEFINED && radv_layout_has_htile(image, dst_layout, dst_queue_mask)) { /* TODO: merge with the clear if applicable */ radv_initialize_htile(cmd_buffer, image, range, 0); |