diff --git a/Source/Core/VideoBackends/D3D12/TextureCache.cpp b/Source/Core/VideoBackends/D3D12/TextureCache.cpp index 309e62c6fc75..f4a57eb3e1d7 100644 --- a/Source/Core/VideoBackends/D3D12/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D12/TextureCache.cpp @@ -106,18 +106,13 @@ void TextureCache::TCacheEntry::CopyRectangleFromTexture( if (src_rect.GetWidth() == dst_rect.GetWidth() && src_rect.GetHeight() == dst_rect.GetHeight()) { - const D3D12_BOX* src_box_pointer = nullptr; - D3D12_BOX src_box; - if (src_rect.left != 0 || src_rect.top != 0) - { - src_box.front = 0; - src_box.back = 1; - src_box.left = src_rect.left; - src_box.top = src_rect.top; - src_box.right = src_rect.right; - src_box.bottom = src_rect.bottom; - src_box_pointer = &src_box; - } + D3D12_BOX srcbox; + srcbox.left = src_rect.left; + srcbox.top = src_rect.top; + srcbox.right = src_rect.right; + srcbox.bottom = src_rect.bottom; + srcbox.front = 0; + srcbox.back = srcentry->config.layers; if (static_cast(src_rect.GetHeight()) > config.height || static_cast(src_rect.GetWidth()) > config.width) @@ -137,7 +132,7 @@ void TextureCache::TCacheEntry::CopyRectangleFromTexture( m_texture->TransitionToResourceState(D3D::current_command_list, D3D12_RESOURCE_STATE_COPY_DEST); srcentry->m_texture->TransitionToResourceState(D3D::current_command_list, D3D12_RESOURCE_STATE_COPY_SOURCE); - D3D::current_command_list->CopyTextureRegion(&dst_location, dst_rect.left, dst_rect.top, 0, &src_location, src_box_pointer); + D3D::current_command_list->CopyTextureRegion(&dst_location, dst_rect.left, dst_rect.top, 0, &src_location, &srcbox); m_texture->TransitionToResourceState(D3D::current_command_list, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); srcentry->m_texture->TransitionToResourceState(D3D::current_command_list, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 746b7b459c2b..ffa2c68ad39d 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -236,7 +236,7 @@ void TextureCacheBase::ScaleTextureCacheEntryTo(TextureCacheBase::TCacheEntryBas newentry->SetDimensions((*entry)->native_width, (*entry)->native_height, 1); newentry->SetHashes((*entry)->base_hash, (*entry)->hash); newentry->frameCount = frameCount; - newentry->is_efb_copy = false; + newentry->is_efb_copy = (*entry)->is_efb_copy; MathUtil::Rectangle srcrect, dstrect; srcrect.left = 0; srcrect.top = 0; @@ -289,7 +289,6 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::DoPartialTextureUpdates(Tex // Efb copies and paletted textures are excluded from these updates, until there's an example where a game would // benefit from this. Both would require more work to be done. - // TODO: Implement upscaling support for normal textures, and then remove the efb to ram and the scaled efb restrictions if (entry_to_update->IsEfbCopy() || isPaletteTexture) return entry_to_update;