github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-07 12:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ImGuiManager: Upload software cursor textures on GPU thread

Browse Source
This commit is contained in:
Stenzek 2025-05-16 19:12:38 +10:00
parent 4ea90f948d
commit 7368047b49
No known key found for this signature in database
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/util/imgui_manager.cpp
View File

@ -93,7 +93,7 @@ static void ClearOSDMessages(bool clear_warnings);
static void AcquirePendingOSDMessages(Timer::Value current_time); static void AcquirePendingOSDMessages(Timer::Value current_time);
static void DrawOSDMessages(Timer::Value current_time); static void DrawOSDMessages(Timer::Value current_time);
static void CreateSoftwareCursorTextures(); static void CreateSoftwareCursorTextures();
static void UpdateSoftwareCursorTexture(u32 index); static void UpdateSoftwareCursorTexture(SoftwareCursor& cursor, const std::string& image_path);
static void DestroySoftwareCursorTextures(); static void DestroySoftwareCursorTextures();
static void DrawSoftwareCursor(const SoftwareCursor& sc, const std::pair<float, float>& pos); static void DrawSoftwareCursor(const SoftwareCursor& sc, const std::pair<float, float>& pos);
@ -1536,10 +1536,12 @@ void ImGuiManager::SetClipboardTextImpl(void* userdata, const char* text)
void ImGuiManager::CreateSoftwareCursorTextures() void ImGuiManager::CreateSoftwareCursorTextures()
{ {
for (u32 i = 0; i < static_cast<u32>(s_state.software_cursors.size()); i++) for (SoftwareCursor& sc : s_state.software_cursors)
{ {
if (!s_state.software_cursors[i].image_path.empty()) // This would normally be a racey read, but when we're initializing ImGuiManager, it's during a reconfigure of the
UpdateSoftwareCursorTexture(i); // GPUThread. That means that the CPU thread is waiting for the reconfigure to finish.
if (!sc.image_path.empty())
UpdateSoftwareCursorTexture(sc, sc.image_path);
} }
} }
@ -1549,10 +1551,9 @@ void ImGuiManager::DestroySoftwareCursorTextures()
sc.texture.reset(); sc.texture.reset();
} }
void ImGuiManager::UpdateSoftwareCursorTexture(u32 index) void ImGuiManager::UpdateSoftwareCursorTexture(SoftwareCursor& sc, const std::string& image_path)
{ {
SoftwareCursor& sc = s_state.software_cursors[index]; if (image_path.empty())
if (sc.image_path.empty())
{ {
sc.texture.reset(); sc.texture.reset();
return; return;
@ -1560,9 +1561,10 @@ void ImGuiManager::UpdateSoftwareCursorTexture(u32 index)
Error error; Error error;
Image image; Image image;
if (!image.LoadFromFile(sc.image_path.c_str(), &error)) if (!image.LoadFromFile(image_path.c_str(), &error))
{ {
ERROR_LOG("Failed to load software cursor {} image '{}': {}", index, sc.image_path, error.GetDescription()); ERROR_LOG("Failed to load software cursor {} image '{}': {}", std::distance(s_state.software_cursors.data(), &sc),
image_path, error.GetDescription());
return; return;
} }
g_gpu_device->RecycleTexture(std::move(sc.texture)); g_gpu_device->RecycleTexture(std::move(sc.texture));
@ -1571,8 +1573,8 @@ void ImGuiManager::UpdateSoftwareCursorTexture(u32 index)
image.GetPitch(), &error); image.GetPitch(), &error);
if (!sc.texture) if (!sc.texture)
{ {
ERROR_LOG("Failed to upload {}x{} software cursor {} image '{}': {}", image.GetWidth(), image.GetHeight(), index, ERROR_LOG("Failed to upload {}x{} software cursor {} image '{}': {}", image.GetWidth(), image.GetHeight(),
sc.image_path, error.GetDescription()); std::distance(s_state.software_cursors.data(), &sc), image_path, error.GetDescription());
return; return;
} }
@ -1616,8 +1618,13 @@ void ImGuiManager::SetSoftwareCursor(u32 index, std::string image_path, float im
const bool is_hiding_or_showing = (image_path.empty() != sc.image_path.empty()); const bool is_hiding_or_showing = (image_path.empty() != sc.image_path.empty());
sc.image_path = std::move(image_path); sc.image_path = std::move(image_path);
sc.scale = image_scale; sc.scale = image_scale;
if (g_gpu_device) if (GPUThread::IsGPUBackendRequested())
UpdateSoftwareCursorTexture(index); {
GPUThread::RunOnThread([index, image_path = sc.image_path]() {
if (GPUThread::HasGPUBackend())
UpdateSoftwareCursorTexture(s_state.software_cursors[index], image_path);
});
}
// Hide the system cursor when we activate a software cursor. // Hide the system cursor when we activate a software cursor.
if (is_hiding_or_showing && index <= InputManager::MAX_POINTER_DEVICES) if (is_hiding_or_showing && index <= InputManager::MAX_POINTER_DEVICES)