From 8e8b9a3cff64ddc43da12951347b009763e96aa9 Mon Sep 17 00:00:00 2001 From: lightningterror <18107717+lightningterror@users.noreply.github.com> Date: Tue, 11 Jan 2022 14:48:19 +0100 Subject: [PATCH] GS-wx: Add tooltip for Preload Textures. --- pcsx2/GS/Window/GSSetting.cpp | 3 +++ pcsx2/GS/Window/GSSetting.h | 1 + pcsx2/GS/Window/GSwxDialog.cpp | 4 +--- pcsx2/GS/Window/GSwxDialog.h | 2 -- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pcsx2/GS/Window/GSSetting.cpp b/pcsx2/GS/Window/GSSetting.cpp index 64653c2e1a..dba31bb799 100644 --- a/pcsx2/GS/Window/GSSetting.cpp +++ b/pcsx2/GS/Window/GSSetting.cpp @@ -193,6 +193,9 @@ const char* dialog_message(int ID, bool* updateText) "Off:\nDisables any dithering.\n\n" "Unscaled:\nNative Dithering / Lowest dithering effect does not increase size of squares when upscaling.\n\n" "Scaled:\nUpscaling-aware / Highest dithering effect."); + case IDC_PRELOAD_TEXTURES: + return cvtString("Uploads entire textures at once instead of small pieces, avoiding redundant uploads when possible.\n" + "Improves performance in most games, but can make a small selection slower."); default: if (updateText) *updateText = false; diff --git a/pcsx2/GS/Window/GSSetting.h b/pcsx2/GS/Window/GSSetting.h index c81c2bfd20..f763de82a8 100644 --- a/pcsx2/GS/Window/GSSetting.h +++ b/pcsx2/GS/Window/GSSetting.h @@ -43,6 +43,7 @@ enum // Renderer IDC_FILTER, // Hardware Renderer + IDC_PRELOAD_TEXTURES, IDC_ACCURATE_DATE, IDC_PALTEX, IDC_CONSERVATIVE_FB, diff --git a/pcsx2/GS/Window/GSwxDialog.cpp b/pcsx2/GS/Window/GSwxDialog.cpp index 82eb412b36..828aba661f 100644 --- a/pcsx2/GS/Window/GSwxDialog.cpp +++ b/pcsx2/GS/Window/GSwxDialog.cpp @@ -285,7 +285,7 @@ RendererTab::RendererTab(wxWindow* parent) auto* paltex_prereq = m_ui.addCheckBox(hw_checks_box, "GPU Palette Conversion", "paltex", IDC_PALTEX, hw_prereq); auto aniso_prereq = [this, paltex_prereq]{ return m_is_hardware && paltex_prereq->GetValue() == false; }; - m_ui.addCheckBox(hw_checks_box, "Preload Textures", "preload_texture", -1, hw_prereq); + m_ui.addCheckBox(hw_checks_box, "Preload Textures", "preload_texture", IDC_PRELOAD_TEXTURES, hw_prereq); auto* hw_choice_grid = new wxFlexGridSizer(2, space, space); @@ -752,8 +752,6 @@ void Dialog::Update() const bool is_upscale = m_renderer_panel->m_internal_resolution->GetSelection() != 0; m_hacks_panel->m_is_native_res = !is_hw || !is_upscale; m_hacks_panel->m_is_hardware = is_hw; - m_hacks_panel->m_is_ogl_hw = renderer == GSRendererType::OGL; - m_hacks_panel->m_is_vk_hw = renderer == GSRendererType::VK; m_renderer_panel->m_is_hardware = is_hw; m_renderer_panel->m_is_native_res = !is_hw || !is_upscale; m_post_panel->m_is_vk_hw = renderer == GSRendererType::VK; diff --git a/pcsx2/GS/Window/GSwxDialog.h b/pcsx2/GS/Window/GSwxDialog.h index dad3bb23fa..738aaa8f9d 100644 --- a/pcsx2/GS/Window/GSwxDialog.h +++ b/pcsx2/GS/Window/GSwxDialog.h @@ -121,8 +121,6 @@ namespace GSSettingsDialog wxSpinCtrl *skip_x_spin, *skip_y_spin; bool m_is_hardware = false; bool m_is_native_res = false; - bool m_is_ogl_hw = false; - bool m_is_vk_hw = false; HacksTab(wxWindow* parent); void Load() { m_ui.Load(); }