From 67843c67a3966bde2b6e5348df41fe0d2f259d2a Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 17 May 2025 16:50:58 +0300 Subject: [PATCH] Removed subpixel GUI option. --- custom.cpp | 4 ---- drawing.cpp | 2 +- od-win32/resources/resource.h | 1 - od-win32/resources/winuae.rc | 5 ++--- od-win32/win32gui.cpp | 2 -- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/custom.cpp b/custom.cpp index 1766d836..82d56d53 100644 --- a/custom.cpp +++ b/custom.cpp @@ -8818,10 +8818,6 @@ void check_prefs_changed_custom(void) init_custom(); } - if (currprefs.chipset_hr != changed_prefs.chipset_hr) { - currprefs.chipset_hr = changed_prefs.chipset_hr; - init_custom(); - } cia_set_eclockphase(); if (syncchange) { varsync_changed = 2; diff --git a/drawing.cpp b/drawing.cpp index f32ab439..c89f47de 100644 --- a/drawing.cpp +++ b/drawing.cpp @@ -5464,7 +5464,7 @@ static uae_u8 *bufg; static void draw_denise_line(int gfx_ypos, enum nln_how how, uae_u32 linecnt, int startpos, int startcycle, int endcycle, int skip, int skip2, int dtotal, int calib_start, int calib_len, bool lol, int hdelay, bool blanked, bool finalseg, struct linestate *ls) { - bool fullline = false; // currprefs.chipset_hr; + bool fullline = false; if (startcycle == 0) { denise_pixtotalv = dtotal; diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index d990ac90..0e99cfd8 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -528,7 +528,6 @@ #define IDC_LORES 1176 #define IDC_KEYBOARDNKRO 1176 #define IDC_RATE2BOX 1177 -#define IDC_SUBPIXEL 1177 #define IDC_AUTORESOLUTIONSELECT 1178 #define IDC_LORES_SMOOTHED 1179 #define IDC_FLICKERFIXER 1180 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 8eb23b13..66a193e8 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -771,11 +771,10 @@ BEGIN RTEXT "Chipset Extra:",IDC_STATIC,226,75,61,15,SS_CENTERIMAGE COMBOBOX IDC_CS_EXT,295,75,88,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Options",IDC_STATIC,221,4,173,175 - CONTROL "Subpixel display emulation",IDC_SUBPIXEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,16,150,10 CONTROL "Immediate Blitter [] Faster but less compatible blitter emulation.",IDC_BLITIMM, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,28,150,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,23,150,10 CONTROL "Wait for Blitter [] Compatibility hack for programs that don't wait for the blitter correctly, causing graphics corruption if CPU is too fast.",IDC_BLITWAIT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,40,150,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,35,150,10 LTEXT "Monitor sync source:",IDC_STATIC,242,96,101,9 COMBOBOX IDC_CS_HVCSYNC,237,108,147,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Video port display hardware:",IDC_STATIC,241,123,117,15,SS_CENTERIMAGE diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 1f1b937b..5ea14ddb 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -9258,7 +9258,6 @@ static void values_to_chipsetdlg (HWND hDlg) CheckDlgButton(hDlg, IDC_BLITWAIT, workprefs.waiting_blits); CheckDlgButton(hDlg, IDC_KEYBOARDNKRO, workprefs.keyboard_nkro); xSendDlgItemMessage(hDlg, IDC_KEYBOARDMODE, CB_SETCURSEL, workprefs.keyboard_mode + 1, 0); - CheckDlgButton(hDlg, IDC_SUBPIXEL, workprefs.chipset_hr); xSendDlgItemMessage(hDlg, IDC_CS_HVCSYNC, CB_SETCURSEL, workprefs.cs_hvcsync, 0); CheckRadioButton(hDlg, IDC_COLLISION0, IDC_COLLISION3, IDC_COLLISION0 + workprefs.collision_level); @@ -9289,7 +9288,6 @@ static void values_from_chipsetdlg (HWND hDlg, UINT msg, WPARAM wParam, LPARAM l workprefs.immediate_blits = ischecked (hDlg, IDC_BLITIMM); workprefs.waiting_blits = ischecked (hDlg, IDC_BLITWAIT) ? 1 : 0; - workprefs.chipset_hr = ischecked(hDlg, IDC_SUBPIXEL); workprefs.keyboard_nkro = ischecked(hDlg, IDC_KEYBOARDNKRO); nn = xSendDlgItemMessage(hDlg, IDC_KEYBOARDMODE, CB_GETCURSEL, 0, 0); if (nn != CB_ERR) { -- 2.47.3