fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 17:30:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

dzn: Lower partial copy of multisample resources to blits

Browse source 
Unfortunately that won't work on transfer queues, but we don't have a
better option right now.

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15698>
This commit is contained in:
Boris Brezillon 2022-04-04 13:45:06 +02:00 • committed by Marge Bot
parent f0667be8b5
commit 451a43ae1e
1 changed files with 57 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/microsoft/vulkan/dzn_cmd_buffer.cpp
View file

@ -2980,28 +2980,69 @@ dzn_CmdCopyImage2(VkCommandBuffer commandBuffer,
bool requires_temp_res = src->vk.format != dst->vk.format &&
src->vk.tiling != VK_IMAGE_TILING_LINEAR &&
dst->vk.tiling != VK_IMAGE_TILING_LINEAR;
/* FIXME: multisample copies only work if we copy the entire subresource
* and if the the copy doesn't require a temporary linear resource. When
* these conditions are not met we should use a blit shader.
*/
bool use_blit = false;
if (src->vk.samples > 1) {
assert(requires_temp_res == false);
use_blit = requires_temp_res;
for (uint32_t i = 0; i < info->regionCount; i++) {
for (int i = 0; i < info->regionCount; i++) {
const VkImageCopy2 &region = info->pRegions[i];
uint32_t src_w = u_minify(src->vk.extent.width, region.srcSubresource.mipLevel);
uint32_t src_h = u_minify(src->vk.extent.width, region.srcSubresource.mipLevel);
assert(region.srcOffset.x == 0 && region.srcOffset.y == 0);
assert(region.extent.width == u_minify(src->vk.extent.width, region.srcSubresource.mipLevel));
assert(region.extent.height == u_minify(src->vk.extent.height, region.srcSubresource.mipLevel));
assert(region.dstOffset.x == 0 && region.dstOffset.y == 0);
assert(region.extent.width == u_minify(dst->vk.extent.width, region.dstSubresource.mipLevel));
assert(region.extent.height == u_minify(dst->vk.extent.height, region.dstSubresource.mipLevel));
if (region.srcOffset.x != 0 || region.srcOffset.y != 0 ||
region.extent.width != u_minify(src->vk.extent.width, region.srcSubresource.mipLevel) ||
region.extent.height != u_minify(src->vk.extent.height, region.srcSubresource.mipLevel) ||
region.dstOffset.x != 0 || region.dstOffset.y != 0 ||
region.extent.width != u_minify(dst->vk.extent.width, region.dstSubresource.mipLevel) ||
region.extent.height != u_minify(dst->vk.extent.height, region.dstSubresource.mipLevel))
use_blit = true;
}
}
if (use_blit) {
/* This copy -> blit lowering doesn't work if the vkCmdCopyImage[2]() is
* is issued on a transfer queue, but we don't have any better option
* right now...
*/
STACK_ARRAY(VkImageBlit2, blit_regions, info->regionCount);
VkBlitImageInfo2 blit_info = {
.sType = VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2,
.srcImage = info->srcImage,
.srcImageLayout = info->srcImageLayout,
.dstImage = info->dstImage,
.dstImageLayout = info->dstImageLayout,
.regionCount = info->regionCount,
.pRegions = blit_regions,
.filter = VK_FILTER_NEAREST,
};
for (uint32_t r = 0; r < info->regionCount; r++) {
blit_regions[r] = VkImageBlit2 {
.sType = VK_STRUCTURE_TYPE_IMAGE_BLIT_2,
.srcSubresource = info->pRegions[r].srcSubresource,
.srcOffsets = {
info->pRegions[r].srcOffset,
info->pRegions[r].srcOffset,
},
.dstSubresource = info->pRegions[r].dstSubresource,
.dstOffsets = {
info->pRegions[r].dstOffset,
info->pRegions[r].dstOffset,
},
};
blit_regions[r].srcOffsets[1].x += info->pRegions[r].extent.width;
blit_regions[r].srcOffsets[1].y += info->pRegions[r].extent.height;
blit_regions[r].srcOffsets[1].z += info->pRegions[r].extent.depth;
blit_regions[r].dstOffsets[1].x += info->pRegions[r].extent.width;
blit_regions[r].dstOffsets[1].y += info->pRegions[r].extent.height;
blit_regions[r].dstOffsets[1].z += info->pRegions[r].extent.depth;
}
dzn_CmdBlitImage2(commandBuffer, &blit_info);
STACK_ARRAY_FINISH(blit_regions);
return;
}
D3D12_TEXTURE_COPY_LOCATION tmp_loc = {};
D3D12_RESOURCE_DESC tmp_desc = {
.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D,