From e5f045c375702e259d0a7b00df880b95a027bf59 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Wed, 26 Aug 2015 23:22:36 +0100 Subject: [PATCH] gsdx: Add new tooltips and descriptions. For Linux and Windows, add tooltip descriptions for AF, AA1, extra rendering threads, Enable Shade Boost, FX Shader/External Shader, FXAA. For Windows, also add Alpha Correction and Logarithmic Z tooltips. For Linux, add software mipmap tooltip. Thanks to tsunami2311, ssakash, gregory38 and whoever did the wiki for helping with descriptions. --- plugins/GSdx/GSLinuxDialog.cpp | 9 +++++++++ plugins/GSdx/GSSetting.cpp | 24 ++++++++++++++++++++++++ plugins/GSdx/GSSetting.h | 10 +++++++++- plugins/GSdx/GSSettingsDlg.cpp | 11 ++++++++++- 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/plugins/GSdx/GSLinuxDialog.cpp b/plugins/GSdx/GSLinuxDialog.cpp index 438fb9a867..d7cf1d2df5 100644 --- a/plugins/GSdx/GSLinuxDialog.cpp +++ b/plugins/GSdx/GSLinuxDialog.cpp @@ -314,6 +314,7 @@ void populate_hw_table(GtkWidget* hw_table) AddTooltip(acc_bld_label, acc_bld_combo_box, IDC_ACCURATE_BLEND_UNIT); AddTooltip(tc_depth_check, IDC_TC_DEPTH); AddTooltip(filter_label, filter_combo_box, IDC_FILTER); + AddTooltip(af_label, af_combo_box, IDC_AFCOMBO); s_table_line = 0; InsertWidgetInTable(hw_table, paltex_check, tc_depth_check); @@ -357,6 +358,10 @@ void populate_sw_table(GtkWidget* sw_table) GtkWidget* mipmap_check = CreateCheckBox("Mipmap", "mipmap", true); GtkWidget* spin_thread_check= CreateCheckBox("Disable thread sleeping (6+ cores CPU)", "spin_thread"); + AddTooltip(aa_check, IDC_AA1); + AddTooltip(mipmap_check, IDC_MIPMAP); + AddTooltip(threads_label, threads_spin, IDC_SWTHREADS); + s_table_line = 0; InsertWidgetInTable(sw_table , threads_label , threads_spin); InsertWidgetInTable(sw_table , aa_check, mipmap_check); @@ -384,6 +389,10 @@ void populate_shader_table(GtkWidget* shader_table) GtkWidget* sb_saturation = CreateScale("ShadeBoost_Saturation", 50); GtkWidget* sb_saturation_label = gtk_label_new("Shade Boost Saturation"); + AddTooltip(shadeboost_check, IDC_SHADEBOOST); + AddTooltip(shaderfx_check, IDC_SHADER_FX); + AddTooltip(fxaa_check, IDC_FXAA); + s_table_line = 0; InsertWidgetInTable(shader_table , fxaa_check); InsertWidgetInTable(shader_table , shadeboost_check); diff --git a/plugins/GSdx/GSSetting.cpp b/plugins/GSdx/GSSetting.cpp index 7e29b2ee41..6a901526ef 100644 --- a/plugins/GSdx/GSSetting.cpp +++ b/plugins/GSdx/GSSetting.cpp @@ -104,6 +104,30 @@ const char* dialog_message(int ID, bool* updateText) { "Ultra:\nThe blending unit will be completely emulated by the shader. It is ultra slow! It is intended for debug."; case IDC_TC_DEPTH: return "Allows the conversion of Depth buffer from/to Color buffer. It is used for blur & depth of field effects"; + case IDC_AFCOMBO: + return "Reduces texture aliasing at extreme viewing angles. High performance impact."; + case IDC_AA1: + return "Internal GS feature. Reduces edge aliasing of lines and triangles when the game requests it."; + case IDC_SWTHREADS: + case IDC_SWTHREADS_EDIT: + return "Increases number of threads used for rendering. Optimal setting depends on CPU."; + case IDC_SHADEBOOST: + return "Allows brightness, contrast and saturation to be manually adjusted."; + case IDC_SHADER_FX: + return "Enables external shader for additional post-processing effects."; + case IDC_FXAA: + return "Enables fast approximate anti-aliasing. Small performance impact."; +#ifdef _WIN32 + // DX9 only + case IDC_FBA: + return "Makes textures partially or fully transparent as required by emulation. May cause unusual slowdowns for some games."; + case IDC_LOGZ: + return "Treat depth as logarithmic instead of linear. Recommended setting is on unless it causes graphical glitches."; +#endif +#ifdef __linux__ + case IDC_MIPMAP: + return "Enables mipmapping, which some games require to render correctly. Turn off only for debug purposes."; +#endif default: if (updateText) *updateText = false; diff --git a/plugins/GSdx/GSSetting.h b/plugins/GSdx/GSSetting.h index be7f4dc244..86673b0d74 100644 --- a/plugins/GSdx/GSSetting.h +++ b/plugins/GSdx/GSSetting.h @@ -62,6 +62,14 @@ enum { IDC_ACCURATE_BLEND_UNIT, IDC_ACCURATE_DATE, IDC_TC_DEPTH, - IDC_CRC_LEVEL + IDC_CRC_LEVEL, + IDC_AFCOMBO, + IDC_AA1, + IDC_SWTHREADS, + IDC_SWTHREADS_EDIT, + IDC_SHADEBOOST, + IDC_SHADER_FX, + IDC_FXAA, + IDC_MIPMAP }; #endif diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp index 064463d53d..94eb4d0d2a 100644 --- a/plugins/GSdx/GSSettingsDlg.cpp +++ b/plugins/GSdx/GSSettingsDlg.cpp @@ -190,6 +190,15 @@ void GSSettingsDlg::OnInit() AddTooltip(IDC_ACCURATE_DATE); AddTooltip(IDC_ACCURATE_BLEND_UNIT); AddTooltip(IDC_TC_DEPTH); + AddTooltip(IDC_AFCOMBO); + AddTooltip(IDC_AA1); + AddTooltip(IDC_SWTHREADS); + AddTooltip(IDC_SWTHREADS_EDIT); + AddTooltip(IDC_SHADEBOOST); + AddTooltip(IDC_SHADER_FX); + AddTooltip(IDC_FXAA); + AddTooltip(IDC_FBA); + AddTooltip(IDC_LOGZ); UpdateControls(); } @@ -423,7 +432,7 @@ void GSSettingsDlg::UpdateControls() // Hacks EnableWindow(GetDlgItem(m_hWnd, IDC_HACKS_ENABLED), hw); - EnableWindow(GetDlgItem(m_hWnd, IDC_HACKSBUTTON), hw /*&& IsDlgButtonChecked(m_hWnd, IDC_HACKS_ENABLED) == BST_CHECKED*/); + EnableWindow(GetDlgItem(m_hWnd, IDC_HACKSBUTTON), hw && IsDlgButtonChecked(m_hWnd, IDC_HACKS_ENABLED)); } }