Refactored Achievement Badges into Texture Layers

Achievement badges/icons are refactored into the type CustomTextureData::ArraySlice::Level as that is the data type images loaded from the filesystem will be. This includes everything that uses the badges in the Qt UI and OnScreenDisplay, and similarly removes the OSD::Icon type because Level already contains that information.

Source/Core/VideoCommon/Assets/CustomTextureData.cpp

@@ -574,6 +574,14 @@ bool LoadPNGTexture(CustomTextureData::ArraySlice::Level* level, const std::stri
   std::vector<u8> buffer(file.GetSize());
   file.ReadBytes(buffer.data(), file.GetSize());
 
+  return LoadPNGTexture(level, buffer);
+}
+
+bool LoadPNGTexture(CustomTextureData::ArraySlice::Level* level, const std::vector<u8>& buffer)
+{
+  if (!level) [[unlikely]]
+    return false;
+
   if (!Common::LoadPNG(buffer, &level->data, &level->width, &level->height))
     return false;
 

Source/Core/VideoCommon/Assets/CustomTextureData.h

@@ -33,4 +33,5 @@ bool LoadDDSTexture(CustomTextureData* texture, const std::string& filename);
 bool LoadDDSTexture(CustomTextureData::ArraySlice::Level* level, const std::string& filename,
                     u32 mip_level);
 bool LoadPNGTexture(CustomTextureData::ArraySlice::Level* level, const std::string& filename);
+bool LoadPNGTexture(CustomTextureData::ArraySlice::Level* level, const std::vector<u8>& buffer);
 }  // namespace VideoCommon

Source/Core/VideoCommon/OnScreenDisplay.cpp

@@ -20,6 +20,7 @@
 
 #include "VideoCommon/AbstractGfx.h"
 #include "VideoCommon/AbstractTexture.h"
+#include "VideoCommon/Assets/CustomTextureData.h"
 #include "VideoCommon/TextureConfig.h"
 
 namespace OSD
@@ -36,8 +37,9 @@ static std::atomic<int> s_obscured_pixels_top = 0;
 struct Message
 {
   Message() = default;
-  Message(std::string text_, u32 duration_, u32 color_, std::unique_ptr<Icon> icon_ = nullptr)
-      : text(std::move(text_)), duration(duration_), color(color_), icon(std::move(icon_))
+  Message(std::string text_, u32 duration_, u32 color_,
+          const VideoCommon::CustomTextureData::ArraySlice::Level* icon_ = nullptr)
+      : text(std::move(text_)), duration(duration_), color(color_), icon(icon_)
   {
     timer.Start();
   }
@@ -48,7 +50,7 @@ struct Message
   bool ever_drawn = false;
   bool should_discard = false;
   u32 color = 0;
-  std::unique_ptr<Icon> icon;
+  const VideoCommon::CustomTextureData::ArraySlice::Level* icon;
   std::unique_ptr<AbstractTexture> texture;
 };
 static std::multimap<MessageType, Message> s_messages;
@@ -95,13 +97,13 @@ static float DrawMessage(int index, Message& msg, const ImVec2& position, int ti
         msg.texture = g_gfx->CreateTexture(tex_config);
         if (msg.texture)
         {
-          msg.texture->Load(0, width, height, width, msg.icon->rgba_data.data(),
+          msg.texture->Load(0, width, height, width, msg.icon->data.data(),
                             sizeof(u32) * width * height);
         }
         else
         {
           // don't try again next time
-          msg.icon.reset();
+          msg.icon = nullptr;
         }
       }
 
@@ -127,7 +129,7 @@ static float DrawMessage(int index, Message& msg, const ImVec2& position, int ti
 }
 
 void AddTypedMessage(MessageType type, std::string message, u32 ms, u32 argb,
-                     std::unique_ptr<Icon> icon)
+                     const VideoCommon::CustomTextureData::ArraySlice::Level* icon)
 {
   std::lock_guard lock{s_messages_mutex};
 
@@ -141,7 +143,8 @@ void AddTypedMessage(MessageType type, std::string message, u32 ms, u32 argb,
   s_messages.emplace(type, Message(std::move(message), ms, argb, std::move(icon)));
 }
 
-void AddMessage(std::string message, u32 ms, u32 argb, std::unique_ptr<Icon> icon)
+void AddMessage(std::string message, u32 ms, u32 argb,
+                const VideoCommon::CustomTextureData::ArraySlice::Level* icon)
 {
   std::lock_guard lock{s_messages_mutex};
   s_messages.emplace(MessageType::Typeless, Message(std::move(message), ms, argb, std::move(icon)));

Source/Core/VideoCommon/OnScreenDisplay.h

@@ -10,6 +10,8 @@
 
 #include "Common/CommonTypes.h"
 
+#include "VideoCommon/Assets/CustomTextureData.h"
+
 namespace OSD
 {
 enum class MessageType
@@ -37,18 +39,12 @@ constexpr u32 NORMAL = 5000;
 constexpr u32 VERY_LONG = 10000;
 };  // namespace Duration
 
-struct Icon
-{
-  std::vector<u8> rgba_data;
-  u32 width = 0;
-  u32 height = 0;
-};  // struct Icon
-
 // On-screen message display (colored yellow by default)
 void AddMessage(std::string message, u32 ms = Duration::SHORT, u32 argb = Color::YELLOW,
-                std::unique_ptr<Icon> icon = nullptr);
+                const VideoCommon::CustomTextureData::ArraySlice::Level* icon = nullptr);
 void AddTypedMessage(MessageType type, std::string message, u32 ms = Duration::SHORT,
-                     u32 argb = Color::YELLOW, std::unique_ptr<Icon> icon = nullptr);
+                     u32 argb = Color::YELLOW,
+                     const VideoCommon::CustomTextureData::ArraySlice::Level* icon = nullptr);
 
 // Draw the current messages on the screen. Only call once per frame.
 void DrawMessages();

Source/Core/VideoCommon/OnScreenUI.cpp

@@ -358,7 +358,7 @@ void OnScreenUI::DrawChallengesAndLeaderboards()
         TextureConfig tex_config(width, height, 1, 1, 1, AbstractTextureFormat::RGBA8, 0,
                                  AbstractTextureType::Texture_2DArray);
         auto res = m_challenge_texture_map.insert_or_assign(name, g_gfx->CreateTexture(tex_config));
-        res.first->second->Load(0, width, height, width, icon->rgba_data.data(),
+        res.first->second->Load(0, width, height, width, icon->data.data(),
                                 sizeof(u32) * width * height);
       }
       for (auto& [name, texture] : m_challenge_texture_map)