From 07f712f8a0c208e4610526fc9ccc307bab099f84 Mon Sep 17 00:00:00 2001 From: dreamsyntax Date: Thu, 26 Dec 2024 17:21:02 -0700 Subject: [PATCH] Core/VideoCommon: Fix duplicate OSD Custom Textures messages Resolves duplicate OSD messages for Loading and Found custom textures. VideoBackend initialization results in HiresTexture::Init being called. We already call HiresTexture::Update when OnNewTitleLoad is called. Thus we can remove HiresTextures::Init completely as it is redundant. --- Source/Core/VideoCommon/HiresTextures.cpp | 5 ----- Source/Core/VideoCommon/HiresTextures.h | 1 - Source/Core/VideoCommon/TextureCacheBase.cpp | 2 -- 3 files changed, 8 deletions(-) diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp index 2f5fd93709..b64c521e08 100644 --- a/Source/Core/VideoCommon/HiresTextures.cpp +++ b/Source/Core/VideoCommon/HiresTextures.cpp @@ -77,11 +77,6 @@ std::pair GetNameArbPair(const TextureInfo& texture_info) } } // namespace -void HiresTexture::Init() -{ - Update(); -} - void HiresTexture::Shutdown() { Clear(); diff --git a/Source/Core/VideoCommon/HiresTextures.h b/Source/Core/VideoCommon/HiresTextures.h index ea370f2741..5312285dd0 100644 --- a/Source/Core/VideoCommon/HiresTextures.h +++ b/Source/Core/VideoCommon/HiresTextures.h @@ -22,7 +22,6 @@ std::set GetTextureDirectoriesWithGameId(const std::string& root_di class HiresTexture { public: - static void Init(); static void Update(); static void Clear(); static void Shutdown(); diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index a624734d60..61882476d7 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -99,8 +99,6 @@ TextureCacheBase::TextureCacheBase() TexDecoder_SetTexFmtOverlayOptions(m_backup_config.texfmt_overlay, m_backup_config.texfmt_overlay_center); - HiresTexture::Init(); - TMEM::InvalidateAll(); }