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

Merge pull request #5220 from stenzek/small-nonsquare-mips 

TextureCache: Fix incomplete GPU texture decoding of non-square mips
This commit is contained in:
Anthony 2017-04-09 13:45:38 -07:00 committed by GitHub
parent 9d070a5df7 2492f196a7
commit c6b553b6d2
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -775,7 +775,8 @@ void TextureCache::DecodeTextureOnGPU(TCacheEntryBase* entry, u32 dst_level, con
glBindTexture(GL_TEXTURE_BUFFER, s_palette_resolv_texture); glBindTexture(GL_TEXTURE_BUFFER, s_palette_resolv_texture);
} }
auto dispatch_groups = TextureConversionShader::GetDispatchCount(info.base_info, width, height); auto dispatch_groups =
TextureConversionShader::GetDispatchCount(info.base_info, aligned_width, aligned_height);
glBindImageTexture(0, static_cast<TCacheEntry*>(entry)->texture, dst_level, GL_TRUE, 0, glBindImageTexture(0, static_cast<TCacheEntry*>(entry)->texture, dst_level, GL_TRUE, 0,
GL_WRITE_ONLY, GL_RGBA8); GL_WRITE_ONLY, GL_RGBA8);
glDispatchCompute(dispatch_groups.first, dispatch_groups.second, 1); glDispatchCompute(dispatch_groups.first, dispatch_groups.second, 1);

3
Source/Core/VideoBackends/Vulkan/TextureConverter.cpp
View File

@ -517,7 +517,8 @@ void TextureConverter::DecodeTexture(TextureCache::TCacheEntry* entry, u32 dst_l
dispatcher.SetTexelBuffer(0, data_view); dispatcher.SetTexelBuffer(0, data_view);
if (has_palette) if (has_palette)
dispatcher.SetTexelBuffer(1, m_texel_buffer_view_r16_uint); dispatcher.SetTexelBuffer(1, m_texel_buffer_view_r16_uint);
auto groups = TextureConversionShader::GetDispatchCount(iter->second.base_info, width, height); auto groups = TextureConversionShader::GetDispatchCount(iter->second.base_info, aligned_width,
aligned_height);
dispatcher.Dispatch(groups.first, groups.second, 1); dispatcher.Dispatch(groups.first, groups.second, 1);
// Copy from temporary texture to final destination. // Copy from temporary texture to final destination.

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

@ -869,7 +869,7 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::Load(const u32 stage)
if (decode_on_gpu) if (decode_on_gpu)
{ {
u32 row_stride = bytes_per_block * (mip_width / bsw); u32 row_stride = bytes_per_block * (expanded_mip_width / bsw);
g_texture_cache->DecodeTextureOnGPU(entry, level, mip_src_data, mip_size, g_texture_cache->DecodeTextureOnGPU(entry, level, mip_src_data, mip_size,
static_cast<TextureFormat>(texformat), mip_width, static_cast<TextureFormat>(texformat), mip_width,
mip_height, expanded_mip_width, expanded_mip_height, mip_height, expanded_mip_width, expanded_mip_height,