Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

D3D11: Fix problems with scaling 16-bit textures, fixes issue with #9345, thanks @ufdada

Browse Source
This commit is contained in:
Henrik Rydgard 2017-02-26 00:03:59 +01:00
parent 49a37e997f
commit 5ba53addb5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
GPU/D3D11/TextureCacheD3D11.cpp
View File

@ -646,13 +646,14 @@ void TextureCacheD3D11::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &
// Create texture
int levels = scaleFactor == 1 ? maxLevel + 1 : 1;
int tw = w, th = h;
DXGI_FORMAT tfmt = dstFmt;
if (replaced.GetSize(level, tw, th)) {
dstFmt = ToDXGIFormat(replaced.Format(level));
tfmt = ToDXGIFormat(replaced.Format(level));
} else {
tw *= scaleFactor;
th *= scaleFactor;
if (scaleFactor > 1) {
dstFmt = DXGI_FORMAT_B8G8R8A8_UNORM;
tfmt = DXGI_FORMAT_B8G8R8A8_UNORM;
}
}
@ -664,7 +665,7 @@ void TextureCacheD3D11::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &
desc.SampleDesc.Count = 1;
desc.Width = tw;
desc.Height = th;
desc.Format = dstFmt;
desc.Format = tfmt;
desc.MipLevels = levels;
desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
@ -720,7 +721,7 @@ void TextureCacheD3D11::LoadTextureLevel(TexCacheEntry &entry, ReplacedTexture &
pixelData = (u32 *)mapData;
// We always end up at 8888. Other parts assume this.
assert(dstFmt == DXGI_FORMAT_B8G8R8A8_UNORM);
assert(scaleFmt == DXGI_FORMAT_B8G8R8A8_UNORM);
bpp = sizeof(u32);
decPitch = w * bpp;

1
GPU/Directx9/GPU_DX9.cpp
View File

@ -478,7 +478,6 @@ void GPU_DX9::CheckGPUFeatures() {
features |= GPU_SUPPORTS_TEXTURE_LOD_CONTROL;
features |= GPU_PREFER_CPU_DOWNLOAD;
features |= GPU_SUPPORTS_ACCURATE_DEPTH;
features |= GPU_SUPPORTS_16BIT_FORMATS;
D3DCAPS9 caps;
ZeroMemory(&caps, sizeof(caps));