From 265ea82780da1191dd6bbf69de4653c504c735af Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Fri, 6 May 2016 21:46:29 +0200 Subject: [PATCH] gsdx tc: avoid to load data outside of the GS memory Avoid crash in Kungfu panda --- plugins/GSdx/GSTextureCache.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/GSdx/GSTextureCache.cpp b/plugins/GSdx/GSTextureCache.cpp index 0b059d018c..3133ab3dcd 100644 --- a/plugins/GSdx/GSTextureCache.cpp +++ b/plugins/GSdx/GSTextureCache.cpp @@ -1744,8 +1744,13 @@ void GSTextureCache::Target::Update() GSVector2i t_size = m_texture->GetSize(); GSVector2 t_scale = m_texture->GetScale(); - t_size.x = t_size.x/t_scale.x; - t_size.y = t_size.y/t_scale.y; + t_size.x = (int)((float)t_size.x/t_scale.x); + t_size.y = (int)((float)t_size.y/t_scale.y); + + // Don't load above the GS memory + int max_y_blocks = (MAX_BLOCKS - m_TEX0.TBP0) / m_TEX0.TBW; + int max_y = (max_y_blocks >> 5) * GSLocalMemory::m_psm[m_TEX0.PSM].pgs.y; + t_size.y = std::min(t_size.y, max_y); GSVector4i r = m_dirty.GetDirtyRectAndClear(m_TEX0, t_size);