From a93a40e8d9394434332b17f5153147e46eae45e7 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 25 Aug 2018 01:47:36 +0300 Subject: [PATCH] Disable texture_cache::emit_once (MSVC crash) --- rpcs3/Emu/RSX/Common/texture_cache.h | 4 ++-- rpcs3/Emu/RSX/VK/VKTextureCache.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index 6555f7e877..eba0896818 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -510,13 +510,13 @@ namespace rsx template void err_once(const char* fmt, const Args&... params) { - emit_once(true, fmt, params...); + logs::RSX.error(fmt, params...); } template void warn_once(const char* fmt, const Args&... params) { - emit_once(false, fmt, params...); + logs::RSX.warning(fmt, params...); } private: diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index 0d18dc0470..12732f1ce1 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -24,7 +24,7 @@ namespace vk std::unique_ptr dma_buffer; public: - + cached_texture_section() {} void reset(u32 base, u32 length) @@ -365,7 +365,7 @@ namespace vk } } }; - + struct discarded_storage { std::unique_ptr combined_image; @@ -485,7 +485,7 @@ namespace vk return mapping; } - + protected: void free_texture_section(cached_texture_section& tex) override