From 431b4f6f17cb599b3ffae44b44534771d1363e35 Mon Sep 17 00:00:00 2001 From: lightningterror Date: Sun, 5 Nov 2017 02:19:13 +0100 Subject: [PATCH] GSdx: Rearrange HW Hacks Rearrange the two columns of HW hacks, new arrangement is done in alphabetical order on Windows and Linux. Rename some hacks on Linux to match the windows version. Some other minor tweaks as well. --- plugins/GSdx/GSLinuxDialog.cpp | 29 +++++++++++++++-------------- plugins/GSdx/GSdx.rc | 28 ++++++++++++++++------------ 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/plugins/GSdx/GSLinuxDialog.cpp b/plugins/GSdx/GSLinuxDialog.cpp index 6bb04a27d0..ba8e4b4c11 100644 --- a/plugins/GSdx/GSLinuxDialog.cpp +++ b/plugins/GSdx/GSLinuxDialog.cpp @@ -385,27 +385,27 @@ void populate_shader_table(GtkWidget* shader_table) void populate_hack_table(GtkWidget* hack_table) { - GtkWidget* hack_offset_label = left_label("Half-pixel Offset Hack:"); + GtkWidget* hack_offset_label = left_label("Half-pixel Offset:"); GtkWidget* hack_offset_box = CreateComboBoxFromVector(theApp.m_gs_offset_hack, "UserHacks_HalfPixelOffset"); GtkWidget* hack_skipdraw_label = left_label("Skipdraw:"); GtkWidget* hack_skipdraw_spin = CreateSpinButton(0, 1000, "UserHacks_SkipDraw"); GtkWidget* hack_wild_check = CreateCheckBox("Wild Arms Hack", "UserHacks_WildHack"); GtkWidget* hack_tco_label = left_label("Texture Offset: 0x"); GtkWidget* hack_tco_entry = CreateTextBox("UserHacks_TCOffset"); - GtkWidget* align_sprite_check = CreateCheckBox("Align sprite hack", "UserHacks_align_sprite_X"); - GtkWidget* preload_gs_check = CreateCheckBox("Preload Frame", "preload_frame_with_gs_data"); + GtkWidget* align_sprite_check = CreateCheckBox("Align Sprite", "UserHacks_align_sprite_X"); + GtkWidget* preload_gs_check = CreateCheckBox("Preload Frame Data", "preload_frame_with_gs_data"); GtkWidget* hack_fast_inv = CreateCheckBox("Fast Texture Invalidation", "UserHacks_DisablePartialInvalidation"); GtkWidget* hack_depth_check = CreateCheckBox("Disable Depth Emulation", "UserHacks_DisableDepthSupport"); GtkWidget* hack_cpu_fbcv = CreateCheckBox("Frame Buffer Conversion", "UserHacks_CPU_FB_Conversion"); - GtkWidget* hack_auto_flush = CreateCheckBox("Auto Flush Primitives", "UserHacks_AutoFlush"); - GtkWidget* hack_unscale_prim = CreateCheckBox("Unscale Point&Line Primitives", "UserHacks_unscale_point_line"); + GtkWidget* hack_auto_flush = CreateCheckBox("Auto Flush", "UserHacks_AutoFlush"); + GtkWidget* hack_unscale_prim = CreateCheckBox("Unscale Point and Line", "UserHacks_unscale_point_line"); GtkWidget* hack_merge_sprite = CreateCheckBox("Merge Sprite", "UserHacks_merge_pp_sprite"); GtkWidget* hack_wrap_mem = CreateCheckBox("Memory Wrapping", "wrap_gs_mem"); GtkWidget* hack_sprite_box = CreateComboBoxFromVector(theApp.m_gs_hack, "UserHacks_SpriteHack"); - GtkWidget* hack_sprite_label = left_label("Alpha-Sprite Hack:"); + GtkWidget* hack_sprite_label = left_label("Sprite:"); GtkWidget* stretch_hack_box = CreateComboBoxFromVector(theApp.m_gs_hack, "UserHacks_round_sprite_offset"); - GtkWidget* stretch_hack_label = left_label("Align Sprite Texture:"); + GtkWidget* stretch_hack_label = left_label("Round Sprite:"); GtkWidget* trilinear_box = CreateComboBoxFromVector(theApp.m_gs_trifilter, "UserHacks_TriFilter"); GtkWidget* trilinear_label = left_label("Trilinear Filtering:"); @@ -433,19 +433,20 @@ void populate_hack_table(GtkWidget* hack_table) s_table_line = 0; - // Hack - InsertWidgetInTable(hack_table , hack_fast_inv , hack_auto_flush); + //Hacks + // Column one and two HW Hacks + InsertWidgetInTable(hack_table , align_sprite_check , hack_wrap_mem); + InsertWidgetInTable(hack_table , hack_auto_flush , hack_merge_sprite); InsertWidgetInTable(hack_table , hack_depth_check , preload_gs_check); - InsertWidgetInTable(hack_table , hack_wrap_mem , hack_cpu_fbcv); - // Upscaling hack - InsertWidgetInTable(hack_table , hack_wild_check , align_sprite_check); - InsertWidgetInTable(hack_table , hack_unscale_prim , hack_merge_sprite); + InsertWidgetInTable(hack_table , hack_fast_inv , hack_unscale_prim); + InsertWidgetInTable(hack_table , hack_cpu_fbcv , hack_wild_check); + // Other upscaling hacks + InsertWidgetInTable(hack_table , trilinear_label , trilinear_box); InsertWidgetInTable(hack_table , hack_offset_label , hack_offset_box); InsertWidgetInTable(hack_table , hack_sprite_label , hack_sprite_box ); InsertWidgetInTable(hack_table , stretch_hack_label , stretch_hack_box ); InsertWidgetInTable(hack_table , hack_skipdraw_label , hack_skipdraw_spin); InsertWidgetInTable(hack_table , hack_tco_label , hack_tco_entry); - InsertWidgetInTable(hack_table , trilinear_label , trilinear_box); } void populate_main_table(GtkWidget* main_table) diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index 608eef882b..fb6bd98115 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -130,19 +130,23 @@ CAPTION "Advanced Settings & Hacks" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN // Hacks settings: - GROUPBOX "USE AT YOUR OWN RISK!",IDC_STATIC,7,7,196,215,0,WS_EX_TRANSPARENT + GROUPBOX "Hacks",IDC_STATIC,7,7,196,215,0,WS_EX_TRANSPARENT + // Column one - HW Hacks CONTROL "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,19,58,8 - CONTROL "Wild Arms Offset",IDC_WILDHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,19,70,8 - CONTROL "Fast Texture Invalidation",IDC_FAST_TC_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,32,92,8 - CONTROL "Preload Frame Data",IDC_PRELOAD_GS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,32,80,8 - CONTROL "Auto Flush",IDC_AUTO_FLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,45,55,8 - CONTROL "Memory Wrapping",IDC_MEMORY_WRAPPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,45,75,8 - CONTROL "Unscale Point and Line",IDC_UNSCALE_POINT_LINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,58,90,8 - CONTROL "Merge Sprite",IDC_MERGE_PP_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,58,90,8 - CONTROL "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,34,8 - CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,71,57,8 - CONTROL "Disable Depth Emulation",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,84,92,8 - CONTROL "Frame Buffer Conversion",IDC_CPU_FB_CONVERSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,84,92,8 + CONTROL "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,32,34,8 + CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,45,57,8 + CONTROL "Auto Flush",IDC_AUTO_FLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,58,55,8 + CONTROL "Disable Depth Emulation",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,92,8 + CONTROL "Fast Texture Invalidation",IDC_FAST_TC_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,84,92,8 + // Column two - HW hacks + CONTROL "Frame Buffer Conversion",IDC_CPU_FB_CONVERSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,19,92,8 + CONTROL "Memory Wrapping",IDC_MEMORY_WRAPPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,32,75,8 + CONTROL "Merge Sprite",IDC_MERGE_PP_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,45,90,8 + CONTROL "Preload Frame Data",IDC_PRELOAD_GS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,58,80,8 + CONTROL "Unscale Point and Line",IDC_UNSCALE_POINT_LINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,71,90,8 + CONTROL "Wild Arms Offset",IDC_WILDHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,84,70,8 + // Columns end + // RTEXT "MSAA:",IDC_MSAA_TEXT,54,99,22,8 COMBOBOX IDC_MSAACB,80,96,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Trilinear Filtering:",IDC_TRI_FILTER_TEXT,16,114,60,8