From: Jason Ekstrand Date: Fri, 2 Feb 2018 03:13:12 +0000 (-0800) Subject: anv/cmd_buffer: Simplify transition_depth_buffer X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7ea8131aa0830b2a834864edcd06354334ea2fd9;p=mesa.git anv/cmd_buffer: Simplify transition_depth_buffer If we don't have HiZ, then anv_layout_to_aux_usage will return NONE for both layouts. If the two layouts are the same, they will get the aux usage. In either case, the code below will give us ISL_AUX_OP_NONE and we'll return without doing anything. Reviewed-by: Samuel Iglesias Gonsálvez --- diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index d90dcb0e1d6..5c36fc740d7 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -432,18 +432,6 @@ transition_depth_buffer(struct anv_cmd_buffer *cmd_buffer, VkImageLayout initial_layout, VkImageLayout final_layout) { - assert(image); - - /* A transition is a no-op if HiZ is not enabled, or if the initial and - * final layouts are equal. - * - * The undefined layout indicates that the user doesn't care about the data - * that's currently in the buffer. Therefore, a data-preserving resolve - * operation is not needed. - */ - if (image->planes[0].aux_usage != ISL_AUX_USAGE_HIZ || initial_layout == final_layout) - return; - const bool hiz_enabled = ISL_AUX_USAGE_HIZ == anv_layout_to_aux_usage(&cmd_buffer->device->info, image, VK_IMAGE_ASPECT_DEPTH_BIT, initial_layout);