ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FullscreenUI: Fix deadlock/abort in Graphics Settings 

Regression from b9f4a01138.

Closes #11249.
This commit is contained in:
Connor McLaughlin 2024-05-15 01:33:28 +10:00 committed by GitHub
parent e520dc2605
commit 67f1d6e24b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcsx2/ImGui/FullscreenUI.cpp
View File

@ -307,7 +307,7 @@ namespace FullscreenUI
static void DrawInterfaceSettingsPage(); static void DrawInterfaceSettingsPage();
static void DrawBIOSSettingsPage(); static void DrawBIOSSettingsPage();
static void DrawEmulationSettingsPage(); static void DrawEmulationSettingsPage();
static void DrawGraphicsSettingsPage(); static void DrawGraphicsSettingsPage(SettingsInterface* bsi, bool show_advanced_settings);
static void DrawAudioSettingsPage(); static void DrawAudioSettingsPage();
static void DrawMemoryCardSettingsPage(); static void DrawMemoryCardSettingsPage();
static void DrawControllerSettingsPage(); static void DrawControllerSettingsPage();
@ -2811,6 +2811,9 @@ void FullscreenUI::DrawSettingsWindow()
ImVec2(io.DisplaySize.x, LayoutScale(LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY + LAYOUT_MENU_BUTTON_Y_PADDING * 2.0f + 2.0f)); ImVec2(io.DisplaySize.x, LayoutScale(LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY + LAYOUT_MENU_BUTTON_Y_PADDING * 2.0f + 2.0f));
const float bg_alpha = VMManager::HasValidVM() ? 0.90f : 1.0f; const float bg_alpha = VMManager::HasValidVM() ? 0.90f : 1.0f;
SettingsInterface* bsi = GetEditingSettingsInterface();
const bool game_settings = IsEditingGameSettings(bsi);
const bool show_advanced_settings = ShouldShowAdvancedSettings(bsi);
if (BeginFullscreenWindow( if (BeginFullscreenWindow(
ImVec2(0.0f, 0.0f), heading_size, "settings_category", ImVec4(UIPrimaryColor.x, UIPrimaryColor.y, UIPrimaryColor.z, bg_alpha))) ImVec2(0.0f, 0.0f), heading_size, "settings_category", ImVec4(UIPrimaryColor.x, UIPrimaryColor.y, UIPrimaryColor.z, bg_alpha)))
@ -2833,11 +2836,7 @@ void FullscreenUI::DrawSettingsWindow()
FSUI_NSTR("Folder Settings"), FSUI_NSTR("Advanced Settings"), FSUI_NSTR("Patches"), FSUI_NSTR("Cheats"), FSUI_NSTR("Folder Settings"), FSUI_NSTR("Advanced Settings"), FSUI_NSTR("Patches"), FSUI_NSTR("Cheats"),
FSUI_NSTR("Game Fixes")}; FSUI_NSTR("Game Fixes")};
SettingsInterface* bsi = GetEditingSettingsInterface(); const u32 count = game_settings ? (show_advanced_settings ? std::size(per_game_pages) : (std::size(per_game_pages) - 1)) : std::size(global_pages);
const bool game_settings = IsEditingGameSettings(bsi);
const u32 count = game_settings ? (ShouldShowAdvancedSettings(bsi) ? std::size(per_game_pages) : (std::size(per_game_pages) - 1)) :
std::size(global_pages);
const char* const* icons = game_settings ? per_game_icons : global_icons; const char* const* icons = game_settings ? per_game_icons : global_icons;
const SettingsPage* pages = game_settings ? per_game_pages : global_pages; const SettingsPage* pages = game_settings ? per_game_pages : global_pages;
u32 index = 0; u32 index = 0;
@ -2935,7 +2934,7 @@ void FullscreenUI::DrawSettingsWindow()
break; break;
case SettingsPage::Graphics: case SettingsPage::Graphics:
DrawGraphicsSettingsPage(); DrawGraphicsSettingsPage(bsi, show_advanced_settings);
break; break;
case SettingsPage::Audio: case SettingsPage::Audio:
@ -3442,7 +3441,7 @@ void FullscreenUI::DrawClampingModeSetting(SettingsInterface* bsi, const char* t
} }
} }
void FullscreenUI::DrawGraphicsSettingsPage() void FullscreenUI::DrawGraphicsSettingsPage(SettingsInterface* bsi, bool show_advanced_settings)
{ {
static constexpr const char* s_renderer_names[] = { static constexpr const char* s_renderer_names[] = {
FSUI_NSTR("Automatic (Default)"), FSUI_NSTR("Automatic (Default)"),
@ -3602,8 +3601,6 @@ void FullscreenUI::DrawGraphicsSettingsPage()
FSUI_NSTR("WebP"), FSUI_NSTR("WebP"),
}; };
SettingsInterface* bsi = GetEditingSettingsInterface();
const GSRendererType renderer = const GSRendererType renderer =
static_cast<GSRendererType>(GetEffectiveIntSetting(bsi, "EmuCore/GS", "Renderer", static_cast<int>(GSRendererType::Auto))); static_cast<GSRendererType>(GetEffectiveIntSetting(bsi, "EmuCore/GS", "Renderer", static_cast<int>(GSRendererType::Auto)));
const bool is_hardware = (renderer == GSRendererType::Auto || renderer == GSRendererType::DX11 || renderer == GSRendererType::DX12 || const bool is_hardware = (renderer == GSRendererType::Auto || renderer == GSRendererType::DX11 || renderer == GSRendererType::DX12 ||
@ -3912,8 +3909,6 @@ void FullscreenUI::DrawGraphicsSettingsPage()
static constexpr const char* s_gsdump_compression[] = {FSUI_NSTR("Uncompressed"), FSUI_NSTR("LZMA (xz)"), FSUI_NSTR("Zstandard (zst)")}; static constexpr const char* s_gsdump_compression[] = {FSUI_NSTR("Uncompressed"), FSUI_NSTR("LZMA (xz)"), FSUI_NSTR("Zstandard (zst)")};
const bool show_advanced_settings = ShouldShowAdvancedSettings(bsi);
if (show_advanced_settings) if (show_advanced_settings)
{ {
MenuHeading(FSUI_CSTR("Advanced")); MenuHeading(FSUI_CSTR("Advanced"));