ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Copy all layers of textures with CopyRectangleFromTexture

This commit is contained in:
mimimi085181 2016-02-14 17:13:07 +01:00
parent 99555a35ca
commit bb4d636f34
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoBackends/D3D/TextureCache.cpp
View File

@ -93,7 +93,7 @@ void TextureCache::TCacheEntry::CopyRectangleFromTexture(
srcbox.right = srcrect.right; srcbox.right = srcrect.right;
srcbox.bottom = srcrect.bottom; srcbox.bottom = srcrect.bottom;
srcbox.front = 0; srcbox.front = 0;
srcbox.back = 1; srcbox.back = srcentry->config.layers;
D3D::context->CopySubresourceRegion( D3D::context->CopySubresourceRegion(
texture->GetTex(), texture->GetTex(),
@ -130,7 +130,7 @@ void TextureCache::TCacheEntry::CopyRectangleFromTexture(
srcentry->config.width, srcentry->config.height, srcentry->config.width, srcentry->config.height,
PixelShaderCache::GetColorCopyProgram(false), PixelShaderCache::GetColorCopyProgram(false),
VertexShaderCache::GetSimpleVertexShader(), VertexShaderCache::GetSimpleVertexShader(),
VertexShaderCache::GetSimpleInputLayout(), nullptr, 1.0, 0); VertexShaderCache::GetSimpleInputLayout(), GeometryShaderCache::GetCopyGeometryShader(), 1.0, 0);
D3D::context->OMSetRenderTargets(1, D3D::context->OMSetRenderTargets(1,
&FramebufferManager::GetEFBColorTexture()->GetRTV(), &FramebufferManager::GetEFBColorTexture()->GetRTV(),

2
Source/Core/VideoBackends/OGL/TextureCache.cpp
View File

@ -168,7 +168,7 @@ void TextureCache::TCacheEntry::CopyRectangleFromTexture(
0, 0,
dstrect.GetWidth(), dstrect.GetWidth(),
dstrect.GetHeight(), dstrect.GetHeight(),
1); srcentry->config.layers);
return; return;
} }
else if (!framebuffer) else if (!framebuffer)

1
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -226,6 +226,7 @@ void TextureCacheBase::ScaleTextureCacheEntryTo(TextureCacheBase::TCacheEntryBas
TextureCacheBase::TCacheEntryConfig newconfig; TextureCacheBase::TCacheEntryConfig newconfig;
newconfig.width = new_width; newconfig.width = new_width;
newconfig.height = new_height; newconfig.height = new_height;
newconfig.layers = (*entry)->config.layers;
newconfig.rendertarget = true; newconfig.rendertarget = true;
TCacheEntryBase* newentry = AllocateTexture(newconfig); TCacheEntryBase* newentry = AllocateTexture(newconfig);