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] Get rid of duplicate code in ResolveSubresource

Browse Source
This commit is contained in:
Philip Rebohle 2018-01-30 02:20:28 +01:00
parent 6c6b108cdd
commit 08436ad1e1
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/d3d11/d3d11_context.cpp
View File

@ -713,17 +713,17 @@ namespace dxvk {
GetSubresourceFromIndex(srcFormatInfo.aspect, GetSubresourceFromIndex(srcFormatInfo.aspect,
srcTextureInfo->image->info().mipLevels, SrcSubresource); srcTextureInfo->image->info().mipLevels, SrcSubresource);
const VkImageSubresourceLayers dstSubresourceLayers = {
dstSubresource.aspectMask,
dstSubresource.mipLevel,
dstSubresource.arrayLayer, 1 };
const VkImageSubresourceLayers srcSubresourceLayers = {
srcSubresource.aspectMask,
srcSubresource.mipLevel,
srcSubresource.arrayLayer, 1 };
if (srcDesc.SampleDesc.Count == 1) { 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([ EmitCs([
cDstImage = dstTextureInfo->image, cDstImage = dstTextureInfo->image,
cSrcImage = srcTextureInfo->image, cSrcImage = srcTextureInfo->image,
@ -736,22 +736,12 @@ namespace dxvk {
cDstImage->mipLevelExtent(cDstLayers.mipLevel)); cDstImage->mipLevelExtent(cDstLayers.mipLevel));
}); });
} else if (!srcFormatInfo.flags.test(DxgiFormatFlag::Typeless) } 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");
return; return;
} }
const VkImageSubresourceLayers dstSubresourceLayers = {
dstSubresource.aspectMask,
dstSubresource.mipLevel,
dstSubresource.arrayLayer, 1 };
const VkImageSubresourceLayers srcSubresourceLayers = {
srcSubresource.aspectMask,
srcSubresource.mipLevel,
srcSubresource.arrayLayer, 1 };
EmitCs([ EmitCs([
cDstImage = dstTextureInfo->image, cDstImage = dstTextureInfo->image,
cSrcImage = srcTextureInfo->image, cSrcImage = srcTextureInfo->image,