OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dzn: Add missing blit source barriers for enhanced barriers

Browse Source 
I was under the impression these would never be needed, since the source
should already be in the right GENERIC_READ layout, but when resolving
rendering attachments with a blit, the source is still in the layout that
it was in at the end of rendering.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27313>
This commit is contained in:
Jesse Natalie
2024-01-26 12:47:17 -08:00
committed by Marge Bot
parent f91ac2ff41
commit 24f14bfacc
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/microsoft/vulkan/dzn_cmd_buffer.c
View File

@@ -2894,6 +2894,7 @@ dzn_cmd_buffer_blit_issue_barriers(struct dzn_cmd_buffer *cmdbuf,
struct dzn_image *dst, VkImageLayout dst_layout, struct dzn_image *dst, VkImageLayout dst_layout,
const VkImageSubresourceLayers *dst_subres, const VkImageSubresourceLayers *dst_subres,
VkImageAspectFlagBits aspect, VkImageAspectFlagBits aspect,
D3D12_BARRIER_LAYOUT *restore_src_layout,
D3D12_BARRIER_LAYOUT *restore_dst_layout, D3D12_BARRIER_LAYOUT *restore_dst_layout,
bool post) bool post)
{ {
@@ -2915,7 +2916,10 @@ dzn_cmd_buffer_blit_issue_barriers(struct dzn_cmd_buffer *cmdbuf,
if (!post) { if (!post) {
if (cmdbuf->enhanced_barriers) { if (cmdbuf->enhanced_barriers) {
D3D12_BARRIER_LAYOUT dst_new_layout = (aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) ? D3D12_BARRIER_LAYOUT dst_new_layout = (aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) ?
D3D12_BARRIER_LAYOUT_DEPTH_STENCIL_WRITE : D3D12_BARRIER_LAYOUT_RENDER_TARGET; D3D12_BARRIER_LAYOUT_DEPTH_STENCIL_WRITE : D3D12_BARRIER_LAYOUT_RENDER_TARGET;
*restore_src_layout = dzn_cmd_buffer_require_layout(cmdbuf, src, src_layout,
D3D12_BARRIER_LAYOUT_DIRECT_QUEUE_GENERIC_READ,
&src_range);
*restore_dst_layout = dzn_cmd_buffer_require_layout(cmdbuf, dst, *restore_dst_layout = dzn_cmd_buffer_require_layout(cmdbuf, dst,
dst_layout, dst_layout,
dst_new_layout, dst_new_layout,
@@ -2934,6 +2938,10 @@ dzn_cmd_buffer_blit_issue_barriers(struct dzn_cmd_buffer *cmdbuf,
} }
} else { } else {
if (cmdbuf->enhanced_barriers) { if (cmdbuf->enhanced_barriers) {
dzn_cmd_buffer_restore_layout(cmdbuf, src,
D3D12_BARRIER_SYNC_PIXEL_SHADING, D3D12_BARRIER_ACCESS_SHADER_RESOURCE,
D3D12_BARRIER_LAYOUT_DIRECT_QUEUE_GENERIC_READ, *restore_src_layout,
&src_range);
if ((aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) { if ((aspect & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) {
dzn_cmd_buffer_restore_layout(cmdbuf, dst, dzn_cmd_buffer_restore_layout(cmdbuf, dst,
D3D12_BARRIER_SYNC_DEPTH_STENCIL, D3D12_BARRIER_ACCESS_DEPTH_STENCIL_WRITE, D3D12_BARRIER_SYNC_DEPTH_STENCIL, D3D12_BARRIER_ACCESS_DEPTH_STENCIL_WRITE,
@@ -2978,12 +2986,13 @@ dzn_cmd_buffer_blit_region(struct dzn_cmd_buffer *cmdbuf,
uint32_t stencil_bit = support_stencil_blit ? 0xf : 0; uint32_t stencil_bit = support_stencil_blit ? 0xf : 0;
dzn_foreach_aspect(aspect, region->srcSubresource.aspectMask) { dzn_foreach_aspect(aspect, region->srcSubresource.aspectMask) {
D3D12_BARRIER_LAYOUT restore_src_layout = D3D12_BARRIER_LAYOUT_COMMON;
D3D12_BARRIER_LAYOUT restore_dst_layout = D3D12_BARRIER_LAYOUT_COMMON; D3D12_BARRIER_LAYOUT restore_dst_layout = D3D12_BARRIER_LAYOUT_COMMON;
dzn_cmd_buffer_blit_set_pipeline(cmdbuf, src, dst, aspect, info->filter, dzn_blit_resolve_none, stencil_bit); dzn_cmd_buffer_blit_set_pipeline(cmdbuf, src, dst, aspect, info->filter, dzn_blit_resolve_none, stencil_bit);
dzn_cmd_buffer_blit_issue_barriers(cmdbuf, dzn_cmd_buffer_blit_issue_barriers(cmdbuf,
src, info->srcImageLayout, &region->srcSubresource, src, info->srcImageLayout, &region->srcSubresource,
dst, info->dstImageLayout, &region->dstSubresource, dst, info->dstImageLayout, &region->dstSubresource,
aspect, &restore_dst_layout, false); aspect, &restore_src_layout, &restore_dst_layout, false);
dzn_cmd_buffer_blit_prepare_src_view(cmdbuf, info->srcImage, dzn_cmd_buffer_blit_prepare_src_view(cmdbuf, info->srcImage,
aspect, &region->srcSubresource, aspect, &region->srcSubresource,
heap, (*heap_slot)++); heap, (*heap_slot)++);
@@ -3045,7 +3054,7 @@ dzn_cmd_buffer_blit_region(struct dzn_cmd_buffer *cmdbuf,
dzn_cmd_buffer_blit_issue_barriers(cmdbuf, dzn_cmd_buffer_blit_issue_barriers(cmdbuf,
src, info->srcImageLayout, &region->srcSubresource, src, info->srcImageLayout, &region->srcSubresource,
dst, info->dstImageLayout, &region->dstSubresource, dst, info->dstImageLayout, &region->dstSubresource,
aspect, &restore_dst_layout, true); aspect, &restore_src_layout, &restore_dst_layout, true);
} }
} }
@@ -3080,12 +3089,13 @@ dzn_cmd_buffer_resolve_region(struct dzn_cmd_buffer *cmdbuf,
enum dzn_blit_resolve_mode resolve_mode = get_blit_resolve_mode(mode); enum dzn_blit_resolve_mode resolve_mode = get_blit_resolve_mode(mode);
dzn_foreach_aspect(aspect, region->srcSubresource.aspectMask) { dzn_foreach_aspect(aspect, region->srcSubresource.aspectMask) {
D3D12_BARRIER_LAYOUT restore_src_layout = D3D12_BARRIER_LAYOUT_COMMON;
D3D12_BARRIER_LAYOUT restore_dst_layout = D3D12_BARRIER_LAYOUT_COMMON; D3D12_BARRIER_LAYOUT restore_dst_layout = D3D12_BARRIER_LAYOUT_COMMON;
dzn_cmd_buffer_blit_set_pipeline(cmdbuf, src, dst, aspect, VK_FILTER_NEAREST, resolve_mode, stencil_bit); dzn_cmd_buffer_blit_set_pipeline(cmdbuf, src, dst, aspect, VK_FILTER_NEAREST, resolve_mode, stencil_bit);
dzn_cmd_buffer_blit_issue_barriers(cmdbuf, dzn_cmd_buffer_blit_issue_barriers(cmdbuf,
src, info->srcImageLayout, &region->srcSubresource, src, info->srcImageLayout, &region->srcSubresource,
dst, info->dstImageLayout, &region->dstSubresource, dst, info->dstImageLayout, &region->dstSubresource,
aspect, &restore_dst_layout, false); aspect, &restore_src_layout, &restore_dst_layout, false);
dzn_cmd_buffer_blit_prepare_src_view(cmdbuf, info->srcImage, aspect, dzn_cmd_buffer_blit_prepare_src_view(cmdbuf, info->srcImage, aspect,
&region->srcSubresource, &region->srcSubresource,
heap, (*heap_slot)++); heap, (*heap_slot)++);
@@ -3141,7 +3151,7 @@ dzn_cmd_buffer_resolve_region(struct dzn_cmd_buffer *cmdbuf,
dzn_cmd_buffer_blit_issue_barriers(cmdbuf, dzn_cmd_buffer_blit_issue_barriers(cmdbuf,
src, info->srcImageLayout, &region->srcSubresource, src, info->srcImageLayout, &region->srcSubresource,
dst, info->dstImageLayout, &region->dstSubresource, dst, info->dstImageLayout, &region->dstSubresource,
aspect, &restore_dst_layout, true); aspect, &restore_src_layout, &restore_dst_layout, true);
} }
} }