Merge c3892ff5f2 into 3564a256bf

Move achievements code out of DVDInterface::SetDisc

Source/Android/app/proguard-rules.pro

@@ -12,3 +12,8 @@
 -dontwarn org.openjsse.javax.net.ssl.SSLParameters
 -dontwarn org.openjsse.javax.net.ssl.SSLSocket
 -dontwarn org.openjsse.net.ssl.OpenJSSE
+
+# This is referenced in JNI_OnLoad.
+-keep class androidx.core.util.Pair {
+    <init>(java.lang.Object, java.lang.Object);
+}

Source/Core/Common/TraversalServer.cpp

@@ -14,7 +14,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <fmt/base.h>
+#include <fmt/format.h>
 
 #ifdef HAVE_LIBSYSTEMD
 #include <systemd/sd-daemon.h>

Source/Core/Core/Boot/Boot.cpp

@@ -524,6 +524,7 @@ bool CBoot::BootUp(Core::System& system, const Core::CPUThreadGuard& guard,
       NOTICE_LOG_FMT(BOOT, "Booting from disc: {}", disc.path);
       const DiscIO::VolumeDisc* volume =
           SetDisc(system.GetDVDInterface(), std::move(disc.volume), disc.auto_disc_change_paths);
+      AchievementManager::GetInstance().LoadGame(volume);
 
       if (!volume)
         return false;
@@ -642,17 +643,17 @@ bool CBoot::BootUp(Core::System& system, const Core::CPUThreadGuard& guard,
       if (!Load_BS2(system, ipl.path))
         return false;
 
+      const DiscIO::VolumeDisc* volume = nullptr;
       if (ipl.disc)
       {
         NOTICE_LOG_FMT(BOOT, "Inserting disc: {}", ipl.disc->path);
-        SetDisc(system.GetDVDInterface(), DiscIO::CreateDiscForCore(ipl.disc->path),
-                ipl.disc->auto_disc_change_paths);
-      }
-      else
-      {
-        AchievementManager::GetInstance().LoadGame(nullptr);
+
+        volume = SetDisc(system.GetDVDInterface(), DiscIO::CreateDiscForCore(ipl.disc->path),
+                         ipl.disc->auto_disc_change_paths);
       }
 
+      AchievementManager::GetInstance().LoadGame(volume);
+
       SConfig::OnTitleDirectlyBooted(guard);
       return true;
     }

Source/Core/Core/ConfigManager.cpp

@@ -130,6 +130,12 @@ const std::string SConfig::GetGameTDBID() const
   return m_gametdb_id;
 }
 
+const std::string SConfig::GetGameIDElfDol() const
+{
+  std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
+  return m_game_id_elf_dol;
+}
+
 const std::string SConfig::GetTitleName() const
 {
   std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
@@ -158,6 +164,7 @@ void SConfig::ResetRunningGameMetadata()
 {
   std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
   SetRunningGameMetadata("00000000", "", 0, 0, DiscIO::Region::Unknown);
+  SetElfDolID("");
 }
 
 void SConfig::SetRunningGameMetadata(const DiscIO::Volume& volume,
@@ -258,6 +265,12 @@ void SConfig::SetRunningGameMetadata(const std::string& game_id, const std::stri
     DolphinAnalytics::Instance().ReportGameStart();
 }
 
+void SConfig::SetElfDolID(const std::string& game_id)
+{
+  std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
+  m_game_id_elf_dol = game_id;
+}
+
 void SConfig::OnESTitleChanged()
 {
   auto& system = Core::System::GetInstance();
@@ -357,7 +370,9 @@ struct SetGameMetadata
     constexpr char BACKSLASH = '\\';
     constexpr char FORWARDSLASH = '/';
     std::ranges::replace(executable_path, BACKSLASH, FORWARDSLASH);
-    config->SetRunningGameMetadata(SConfig::MakeGameID(PathToFileName(executable_path)));
+    std::string made_game_id = SConfig::MakeGameID(PathToFileName(executable_path));
+    config->SetRunningGameMetadata(made_game_id);
+    config->SetElfDolID(made_game_id);
 
     Host_TitleChanged();
 

Source/Core/Core/ConfigManager.h

@@ -61,6 +61,7 @@ struct SConfig
 
   const std::string GetGameID() const;
   const std::string GetGameTDBID() const;
+  const std::string GetGameIDElfDol() const;
   const std::string GetTitleName() const;
   const std::string GetTitleDescription() const;
   u64 GetTitleID() const;
@@ -70,6 +71,8 @@ struct SConfig
   void SetRunningGameMetadata(const IOS::ES::TMDReader& tmd, DiscIO::Platform platform);
   void SetRunningGameMetadata(const std::string& game_id);
 
+  void SetElfDolID(const std::string& game_id);
+
   // Triggered when Dolphin loads a title directly
   // Reloads title-specific map files, patches, etc.
   static void OnTitleDirectlyBooted(const Core::CPUThreadGuard& guard);
@@ -125,6 +128,7 @@ private:
   mutable std::recursive_mutex m_metadata_lock;
 
   std::string m_game_id;
+  std::string m_game_id_elf_dol;
   std::string m_gametdb_id;
   std::string m_title_name;
   std::string m_title_description;

Source/Core/Core/DSP/LabelMap.cpp

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include <fmt/base.h>
+#include <fmt/format.h>
 
 #include "Core/DSP/DSPTables.h"
 

Source/Core/Core/FifoPlayer/FifoDataFile.cpp

@@ -274,7 +274,8 @@ std::unique_ptr<FifoDataFile> FifoDataFile::Load(const std::string& filename, bo
   }
   else
   {
-    dataFile->m_game_id = std::string{header.gameid, DEFAULT_GAME_ID.size()};
+    const size_t gameid_length = strnlen(header.gameid, DEFAULT_GAME_ID.size());
+    dataFile->m_game_id = std::string{header.gameid, gameid_length};
   }
 
   if (flagsOnly)

Source/Core/Core/HW/DVD/DVDInterface.cpp

@@ -420,8 +420,6 @@ void DVDInterface::SetDisc(std::unique_ptr<DiscIO::VolumeDisc> disc,
     m_auto_disc_change_index = 0;
   }
 
-  AchievementManager::GetInstance().LoadGame(disc.get());
-
   // Assume that inserting a disc requires having an empty disc before
   if (had_disc != has_disc)
     ExpansionInterface::g_rtc_flags[ExpansionInterface::RTCFlag::DiscChanged] = true;
@@ -444,6 +442,7 @@ void DVDInterface::AutoChangeDiscCallback(Core::System& system, u64 userdata, s6
 
 void DVDInterface::EjectDiscCallback(Core::System& system, u64 userdata, s64 cyclesLate)
 {
+  AchievementManager::GetInstance().LoadGame(nullptr);
   system.GetDVDInterface().SetDisc(nullptr, {});
 }
 
@@ -454,9 +453,14 @@ void DVDInterface::InsertDiscCallback(Core::System& system, u64 userdata, s64 cy
       DiscIO::CreateDiscForCore(di.m_disc_path_to_insert);
 
   if (new_disc)
+  {
+    AchievementManager::GetInstance().LoadGame(new_disc.get());
     di.SetDisc(std::move(new_disc), {});
+  }
   else
+  {
     PanicAlertFmtT("The disc that was about to be inserted couldn't be found.");
+  }
 
   di.m_disc_path_to_insert.clear();
 }

Source/Core/InputCommon/DynamicInputTextureManager.cpp

@@ -25,8 +25,9 @@ void DynamicInputTextureManager::Load()
   m_configuration.clear();
 
   const std::string& game_id = SConfig::GetInstance().GetGameID();
-  const std::set<std::string> dynamic_input_directories =
-      GetTextureDirectoriesWithGameId(File::GetUserPath(D_DYNAMICINPUT_IDX), game_id);
+  const std::string& game_id_elf_dol = SConfig::GetInstance().GetGameIDElfDol();
+  const std::set<std::string> dynamic_input_directories = GetTextureDirectoriesWithGameId(
+      File::GetUserPath(D_DYNAMICINPUT_IDX), game_id_elf_dol.empty() ? game_id : game_id_elf_dol);
 
   for (const auto& dynamic_input_directory : dynamic_input_directories)
   {

Source/Core/VideoCommon/HiresTextures.cpp

@@ -85,8 +85,12 @@ void HiresTexture::Update()
   }
 
   const std::string& game_id = SConfig::GetInstance().GetGameID();
-  const std::set<std::string> texture_directories =
-      GetTextureDirectoriesWithGameId(File::GetUserPath(D_HIRESTEXTURES_IDX), game_id);
+  const std::string& game_id_elf_dol = SConfig::GetInstance().GetGameIDElfDol();
+
+  // If there is an elf/dol id, use that. Otherwise, fallback to the game id.
+  const std::set<std::string> texture_directories = GetTextureDirectoriesWithGameId(
+      File::GetUserPath(D_HIRESTEXTURES_IDX), game_id_elf_dol.empty() ? game_id : game_id_elf_dol);
+
   constexpr auto extensions = std::to_array<std::string_view>({".png", ".dds"});
 
   for (const auto& texture_directory : texture_directories)
@@ -141,16 +145,12 @@ void HiresTexture::Update()
     }
   }
 
-  if (g_ActiveConfig.bCacheHiresTextures)
-  {
-    OSD::AddMessage(fmt::format("Loading '{}' custom textures", s_hires_texture_cache.size()),
-                    10000);
-  }
-  else
-  {
-    OSD::AddMessage(
-        fmt::format("Found '{}' custom textures", s_hires_texture_id_to_arbmipmap.size()), 10000);
-  }
+  const auto message =
+      fmt::format("{} '{}' custom textures for {} '{}'",
+                  g_ActiveConfig.bCacheHiresTextures ? "Preloading" : "Found",
+                  s_hires_texture_cache.size(), game_id_elf_dol.empty() ? "game" : "elf/dol",
+                  game_id_elf_dol.empty() ? game_id : game_id_elf_dol);
+  OSD::AddMessage(message, 10000);
 }
 
 void HiresTexture::Clear()