backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d11] Use UpdateImage in D3D11ImmediateContext::UnmapImage

Browse Source
This commit is contained in:
Philip Rebohle 2021-06-24 03:15:07 +02:00
parent 6ba1746d46
commit fd66f44561
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/d3d11/d3d11_context_imm.cpp
View File

@ -494,46 +494,12 @@ namespace dxvk {
if (pResource->GetMapMode() == D3D11_COMMON_TEXTURE_MAP_MODE_BUFFER) { if (pResource->GetMapMode() == D3D11_COMMON_TEXTURE_MAP_MODE_BUFFER) {
// Now that data has been written into the buffer, // Now that data has been written into the buffer,
// we need to copy its contents into the image // we need to copy its contents into the image
const Rc<DxvkImage> mappedImage = pResource->GetImage(); VkImageAspectFlags aspectMask = imageFormatInfo(pResource->GetPackedFormat())->aspectMask;
const Rc<DxvkBuffer> mappedBuffer = pResource->GetMappedBuffer(Subresource); VkImageSubresource subresource = pResource->GetSubresourceFromIndex(aspectMask, Subresource);
VkFormat packedFormat = m_parent->LookupPackedFormat( UpdateImage(pResource, &subresource, VkOffset3D { 0, 0, 0 },
pResource->Desc()->Format, pResource->GetFormatMode()).Format; pResource->MipLevelExtent(subresource.mipLevel),
DxvkBufferSlice(pResource->GetMappedBuffer(Subresource)));
auto formatInfo = imageFormatInfo(packedFormat);
auto subresource = pResource->GetSubresourceFromIndex(
formatInfo->aspectMask, Subresource);
VkExtent3D levelExtent = mappedImage
->mipLevelExtent(subresource.mipLevel);
VkImageSubresourceLayers subresourceLayers = {
subresource.aspectMask,
subresource.mipLevel,
subresource.arrayLayer, 1 };
EmitCs([
cSrcBuffer = mappedBuffer,
cDstImage = mappedImage,
cDstLayers = subresourceLayers,
cDstLevelExtent = levelExtent,
cPackedFormat = GetPackedDepthStencilFormat(pResource->Desc()->Format)
] (DxvkContext* ctx) {
if (cPackedFormat == VK_FORMAT_UNDEFINED) {
ctx->copyBufferToImage(cDstImage, cDstLayers,
VkOffset3D { 0, 0, 0 }, cDstLevelExtent,
cSrcBuffer, 0, 0, 0);
} else {
ctx->copyPackedBufferToDepthStencilImage(
cDstImage, cDstLayers,
VkOffset2D { 0, 0 },
VkExtent2D { cDstLevelExtent.width, cDstLevelExtent.height },
cSrcBuffer, 0,
VkOffset2D { 0, 0 },
VkExtent2D { cDstLevelExtent.width, cDstLevelExtent.height },
cPackedFormat);
}
});
} }
} }