piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5206 from ligfx/fixcustomtextures

Browse Source 
TextureCacheBase: fix custom textures not being loaded
This commit is contained in:
Stenzek
2017-04-05 16:49:54 +10:00
committed by GitHub
parent 9fc223302b e9e3226026
commit 27e9e469d4
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,10 +781,12 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::Load(const u32 stage)
if (!entry) if (!entry)
return nullptr; return nullptr;
if (!hires_tex)
{
const u8* tlut = &texMem[tlutaddr]; const u8* tlut = &texMem[tlutaddr];
if (decode_on_gpu) if (hires_tex)
{
entry->Load(temp, width, height, expandedWidth, 0);
}
else if (decode_on_gpu)
{ {
u32 row_stride = bytes_per_block * (expandedWidth / bsw); u32 row_stride = bytes_per_block * (expandedWidth / bsw);
g_texture_cache->DecodeTextureOnGPU( g_texture_cache->DecodeTextureOnGPU(
@ -807,7 +809,6 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::Load(const u32 stage)
entry->Load(temp, width, height, expandedWidth, 0); entry->Load(temp, width, height, expandedWidth, 0);
} }
}
iter = textures_by_address.emplace(address, entry); iter = textures_by_address.emplace(address, entry);
if (g_ActiveConfig.iSafeTextureCache_ColorSamples == 0 || if (g_ActiveConfig.iSafeTextureCache_ColorSamples == 0 ||