fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Add a image_transition helper for separate depth/stencil layouts

Browse source 
This just reduces churn a bit when we switch to dynamic rendering.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18084>
This commit is contained in:
Jason Ekstrand 2022-06-02 13:18:05 -05:00 • committed by Marge Bot
parent 8c06fa9b9e
commit b772e30ce7
1 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -4488,6 +4488,34 @@ radv_get_attachment_sample_locations(struct radv_cmd_buffer *cmd_buffer, uint32_
return NULL;
}
static void
radv_handle_image_transition_separate(struct radv_cmd_buffer *cmd_buffer, struct radv_image *image,
VkImageLayout src_layout, VkImageLayout dst_layout,
VkImageLayout src_stencil_layout,
VkImageLayout dst_stencil_layout,
uint32_t src_family_index, uint32_t dst_family_index,
const VkImageSubresourceRange *range,
struct radv_sample_locations_state *sample_locs)
{
/* For separate layouts, perform depth and stencil transitions separately. */
if (range->aspectMask == (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT) &&
(src_layout != src_stencil_layout || dst_layout != dst_stencil_layout)) {
VkImageSubresourceRange aspect_range = *range;
/* Depth-only transitions. */
aspect_range.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
radv_handle_image_transition(cmd_buffer, image, src_layout, dst_layout,
src_family_index, dst_family_index, &aspect_range, sample_locs);
/* Stencil-only transitions. */
aspect_range.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
radv_handle_image_transition(cmd_buffer, image, src_stencil_layout, dst_stencil_layout,
src_family_index, dst_family_index, &aspect_range, sample_locs);
} else {
radv_handle_image_transition(cmd_buffer, image, src_layout, dst_layout,
src_family_index, dst_family_index, range, sample_locs);
}
}
static void
radv_handle_subpass_image_transition(struct radv_cmd_buffer *cmd_buffer,
struct radv_subpass_attachment att, bool begin_subpass)
@ -4518,35 +4546,12 @@ radv_handle_subpass_image_transition(struct radv_cmd_buffer *cmd_buffer,
*/
sample_locs = radv_get_attachment_sample_locations(cmd_buffer, idx, begin_subpass);
/* Determine if the subpass uses separate depth/stencil layouts. */
bool uses_separate_depth_stencil_layouts = false;
if ((cmd_buffer->state.attachments[idx].current_layout !=
cmd_buffer->state.attachments[idx].current_stencil_layout) ||
(att.layout != att.stencil_layout)) {
uses_separate_depth_stencil_layouts = true;
}
/* For separate layouts, perform depth and stencil transitions
* separately.
*/
if (uses_separate_depth_stencil_layouts &&
(range.aspectMask == (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) {
/* Depth-only transitions. */
range.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT;
radv_handle_image_transition(cmd_buffer, view->image,
cmd_buffer->state.attachments[idx].current_layout,
att.layout, 0, 0, &range, sample_locs);
/* Stencil-only transitions. */
range.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
radv_handle_image_transition(
cmd_buffer, view->image, cmd_buffer->state.attachments[idx].current_stencil_layout,
att.stencil_layout, 0, 0, &range, sample_locs);
} else {
radv_handle_image_transition(cmd_buffer, view->image,
cmd_buffer->state.attachments[idx].current_layout,
att.layout, 0, 0, &range, sample_locs);
}
radv_handle_image_transition_separate(cmd_buffer, view->image,
cmd_buffer->state.attachments[idx].current_layout,
att.layout,
cmd_buffer->state.attachments[idx].current_stencil_layout,
att.stencil_layout,
0, 0, &range, sample_locs);
cmd_buffer->state.attachments[idx].current_layout = att.layout;
cmd_buffer->state.attachments[idx].current_stencil_layout = att.stencil_layout;