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] Handle non-multisampled source images in ResolveSubresource

Browse Source
This commit is contained in:
Philip Rebohle 2018-01-30 01:18:43 +01:00
parent fb641a3dc8
commit 6c6b108cdd
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/d3d11/d3d11_context.cpp
View File

@ -694,7 +694,7 @@ namespace dxvk {
dstTexture->GetDesc(&dstDesc); dstTexture->GetDesc(&dstDesc);
srcTexture->GetDesc(&srcDesc); srcTexture->GetDesc(&srcDesc);
if (dstDesc.SampleDesc.Count != 1 || srcDesc.SampleDesc.Count == 1) { if (dstDesc.SampleDesc.Count != 1) {
Logger::err("D3D11: ResolveSubresource: Resource sample count invalid"); Logger::err("D3D11: ResolveSubresource: Resource sample count invalid");
return; return;
} }
@ -713,7 +713,29 @@ namespace dxvk {
GetSubresourceFromIndex(srcFormatInfo.aspect, GetSubresourceFromIndex(srcFormatInfo.aspect,
srcTextureInfo->image->info().mipLevels, SrcSubresource); srcTextureInfo->image->info().mipLevels, SrcSubresource);
if (!srcFormatInfo.flags.test(DxgiFormatFlag::Typeless) if (srcDesc.SampleDesc.Count == 1) {
const VkImageSubresourceLayers dstSubresourceLayers = {
dstSubresource.aspectMask,
dstSubresource.mipLevel,
dstSubresource.arrayLayer, 1 };
const VkImageSubresourceLayers srcSubresourceLayers = {
srcSubresource.aspectMask,
srcSubresource.mipLevel,
srcSubresource.arrayLayer, 1 };
EmitCs([
cDstImage = dstTextureInfo->image,
cSrcImage = srcTextureInfo->image,
cDstLayers = dstSubresourceLayers,
cSrcLayers = srcSubresourceLayers
] (DxvkContext* ctx) {
ctx->copyImage(
cDstImage, cDstLayers, VkOffset3D { 0, 0, 0 },
cSrcImage, cSrcLayers, VkOffset3D { 0, 0, 0 },
cDstImage->mipLevelExtent(cDstLayers.mipLevel));
});
} else if (!srcFormatInfo.flags.test(DxgiFormatFlag::Typeless)
&& !srcFormatInfo.flags.test(DxgiFormatFlag::Typeless)) { && !srcFormatInfo.flags.test(DxgiFormatFlag::Typeless)) {
if (dstDesc.Format != srcDesc.Format) { if (dstDesc.Format != srcDesc.Format) {
Logger::err("D3D11: ResolveSubresource: Incompatible formats"); Logger::err("D3D11: ResolveSubresource: Incompatible formats");