Removed subpixel GUI option.

diff --git a/custom.cpp b/custom.cpp
index 1766d8369bc8672b9ad613ff61a497d0d68256f9..82d56d53292fbf5be27d9ef2dd0840f8bea609e5 100644 (file)
--- 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 f32ab43920074df6ae7356900b9a1d8443fac0fd..c89f47de780f512f22e3b0c99b0bd2fe75307920 100644 (file)
--- 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 d990ac909f0eb32cec388c3820b3e3e2b5428be4..0e99cfd819016825bd88882f0600a4de2bf04aeb 100644 (file)
--- 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 8eb23b138baa59af606fcb6ea8d17260953452ea..66a193e89ee3b8c9ecaf77f9b8cfd8033eb1c3eb 100644 (file)
--- 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 1f1b937bd6bbb82c67d4340797b408a38e8a2134..5ea14ddb3a8e2191f4ccadf485fbedf83b276021 100644 (file)
--- 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) {