rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-31 05:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Use UpdateImage in D3D11DeferredContext::MapImage

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

44
src/d3d11/d3d11_context_def.cpp
View File

@ -314,8 +314,7 @@ namespace dxvk {
D3D11_MAP MapType, D3D11_MAP MapType,
UINT MapFlags, UINT MapFlags,
D3D11DeferredContextMapEntry* pMapEntry) { D3D11DeferredContextMapEntry* pMapEntry) {
const D3D11CommonTexture* pTexture = GetCommonTexture(pResource); D3D11CommonTexture* pTexture = GetCommonTexture(pResource);
const Rc<DxvkImage> image = pTexture->GetImage();
if (unlikely(pTexture->GetMapMode() == D3D11_COMMON_TEXTURE_MAP_MODE_NONE)) { if (unlikely(pTexture->GetMapMode() == D3D11_COMMON_TEXTURE_MAP_MODE_NONE)) {
Logger::err("D3D11: Cannot map a device-local image"); Logger::err("D3D11: Cannot map a device-local image");
@ -325,14 +324,13 @@ namespace dxvk {
if (unlikely(Subresource >= pTexture->CountSubresources())) if (unlikely(Subresource >= pTexture->CountSubresources()))
return E_INVALIDARG; return E_INVALIDARG;
VkFormat packedFormat = m_parent->LookupPackedFormat( VkFormat packedFormat = pTexture->GetPackedFormat();
pTexture->Desc()->Format, pTexture->GetFormatMode()).Format;
auto formatInfo = imageFormatInfo(packedFormat); auto formatInfo = imageFormatInfo(packedFormat);
auto subresource = pTexture->GetSubresourceFromIndex( auto subresource = pTexture->GetSubresourceFromIndex(
formatInfo->aspectMask, Subresource); formatInfo->aspectMask, Subresource);
VkExtent3D levelExtent = image->mipLevelExtent(subresource.mipLevel); VkExtent3D levelExtent = pTexture->MipLevelExtent(subresource.mipLevel);
auto layout = pTexture->GetSubresourceLayout(formatInfo->aspectMask, Subresource); auto layout = pTexture->GetSubresourceLayout(formatInfo->aspectMask, Subresource);
auto dataSlice = AllocStagingBuffer(util::computeImageDataSize(packedFormat, levelExtent)); auto dataSlice = AllocStagingBuffer(util::computeImageDataSize(packedFormat, levelExtent));
@ -344,39 +342,9 @@ namespace dxvk {
pMapEntry->DepthPitch = layout.DepthPitch; pMapEntry->DepthPitch = layout.DepthPitch;
pMapEntry->MapPointer = dataSlice.mapPtr(0); pMapEntry->MapPointer = dataSlice.mapPtr(0);
EmitCs([ UpdateImage(pTexture, &subresource,
cDstImage = pTexture->GetImage(), VkOffset3D { 0, 0, 0 }, levelExtent,
cSubresource = pTexture->GetSubresourceFromIndex(formatInfo->aspectMask, Subresource), std::move(dataSlice));
cStagingSlice = std::move(dataSlice),
cPackedFormat = GetPackedDepthStencilFormat(pTexture->Desc()->Format)
] (DxvkContext* ctx) {
VkImageSubresourceLayers dstLayers;
dstLayers.aspectMask = cSubresource.aspectMask;
dstLayers.mipLevel = cSubresource.mipLevel;
dstLayers.baseArrayLayer = cSubresource.arrayLayer;
dstLayers.layerCount = 1;
VkOffset3D dstOffset = { 0, 0, 0 };
VkExtent3D dstExtent = cDstImage->mipLevelExtent(dstLayers.mipLevel);
if (cPackedFormat == VK_FORMAT_UNDEFINED) {
ctx->copyBufferToImage(cDstImage,
dstLayers, dstOffset, dstExtent,
cStagingSlice.buffer(),
cStagingSlice.offset(), 0, 0);
} else {
ctx->copyPackedBufferToDepthStencilImage(
cDstImage, dstLayers,
VkOffset2D { dstOffset.x, dstOffset.y },
VkExtent2D { dstExtent.width, dstExtent.height },
cStagingSlice.buffer(),
cStagingSlice.offset(),
VkOffset2D { dstOffset.x, dstOffset.y },
VkExtent2D { dstExtent.width, dstExtent.height },
cPackedFormat);
}
});
return S_OK; return S_OK;
} }