FullscreenUI: Skip SVG prefix if image is not a SVG

stenzek · Jan 18, 2025 · 227c249 · 227c249
1 parent c34dda3
commit 227c249
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/util/imgui_fullscreen.cpp b/src/util/imgui_fullscreen.cpp
@@ -374,6 +374,10 @@ GPUTexture* ImGuiFullscreen::GetCachedTexture(std::string_view name)
 
 GPUTexture* ImGuiFullscreen::GetCachedTexture(std::string_view name, u32 svg_width, u32 svg_height)
 {
+  // ignore size hints if it's not needed, don't duplicate
+  if (!TextureNeedsSVGDimensions(name))
+    return GetCachedTexture(name);
+
   svg_width = static_cast<u32>(std::ceil(LayoutScale(static_cast<float>(svg_width))));
   svg_height = static_cast<u32>(std::ceil(LayoutScale(static_cast<float>(svg_height))));
 
@@ -420,6 +424,11 @@ bool ImGuiFullscreen::InvalidateCachedTexture(std::string_view path)
           0);
 }
 
+bool ImGuiFullscreen::TextureNeedsSVGDimensions(std::string_view path)
+{
+  return StringUtil::EndsWithNoCase(Path::GetExtension(path), "svg");
+}
+
 void ImGuiFullscreen::UploadAsyncTextures()
 {
   std::unique_lock lock(s_state.shared_state_mutex);

diff --git a/src/util/imgui_fullscreen.h b/src/util/imgui_fullscreen.h
@@ -142,6 +142,7 @@ GPUTexture* GetCachedTexture(std::string_view name);
 GPUTexture* GetCachedTexture(std::string_view name, u32 svg_width, u32 svg_height);
 GPUTexture* GetCachedTextureAsync(std::string_view name);
 bool InvalidateCachedTexture(std::string_view path);
+bool TextureNeedsSVGDimensions(std::string_view path);
 void UploadAsyncTextures();
 
 void BeginLayout();