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

rsx: Handle some more corner cases

This commit is contained in:
kd-11 2022-10-02 18:45:27 +03:00 committed by kd-11
parent 765208a181
commit 533f960854
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/RSX/Common/texture_cache.h
View File

@ -3237,7 +3237,7 @@ namespace rsx
return m_predictor; return m_predictor;
} }
bool is_protected(u32 section_base_address) bool is_protected(u32 section_base_address, const address_range& test_range, rsx::texture_upload_context context)
{ {
reader_lock lock(m_cache_mutex); reader_lock lock(m_cache_mutex);
@ -3246,7 +3246,9 @@ namespace rsx
{ {
if (tex.get_section_base() == section_base_address) if (tex.get_section_base() == section_base_address)
{ {
return tex.is_locked(); return tex.get_context() == context &&
tex.is_locked() &&
test_range.inside(tex.get_section_range());
} }
} }

6
rpcs3/Emu/RSX/GL/GLRenderTargets.cpp
View File

@ -321,7 +321,11 @@ void GLGSRender::init_buffers(rsx::framebuffer_creation_context context, bool /*
bool lock = surface->is_depth_surface() ? !!g_cfg.video.write_depth_buffer : bool lock = surface->is_depth_surface() ? !!g_cfg.video.write_depth_buffer :
!!g_cfg.video.write_color_buffers; !!g_cfg.video.write_color_buffers;
if (lock && !m_gl_texture_cache.is_protected(base_addr)) if (lock &&
!m_gl_texture_cache.is_protected(
base_addr,
surface->get_memory_range(),
rsx::texture_upload_context::framebuffer_storage))
{ {
lock = false; lock = false;
} }

6
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View File

@ -2426,7 +2426,11 @@ void VKGSRender::prepare_rtts(rsx::framebuffer_creation_context context)
bool lock = surface->is_depth_surface() ? !!g_cfg.video.write_depth_buffer : bool lock = surface->is_depth_surface() ? !!g_cfg.video.write_depth_buffer :
!!g_cfg.video.write_color_buffers; !!g_cfg.video.write_color_buffers;
if (lock && !m_texture_cache.is_protected(base_addr)) if (lock &&
!m_texture_cache.is_protected(
base_addr,
surface->get_memory_range(),
rsx::texture_upload_context::framebuffer_storage))
{ {
lock = false; lock = false;
} }