Check also VB and HB when programmed mode changes but only if they have not been...

diff --git a/custom.cpp b/custom.cpp
index 0ba753616e1c416742674e1a05eff06eeb4d58d5..4c3e51723716e49b4c69b7e459394aa5af2e710b 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -348,7 +348,7 @@ uae_u16 bemcon0_hsync_mask, bemcon0_vsync_mask;
 static uae_u16 beamcon0_saved;
 static uae_u16 bplcon0_saved, bplcon1_saved, bplcon2_saved;
 static uae_u16 bplcon3_saved, bplcon4_saved;
-static int varsync_changed;
+static int varsync_changed, varsync_maybe_changed[2];
 static uae_u16 vt_old, ht_old, hs_old, vs_old;
 uae_u16 vtotal, htotal;
 static int maxvpos_stored, maxhpos_stored;
@@ -8928,9 +8928,22 @@ static void varsync(int reg, bool resync)
 #endif
        thisline_changed = 1;
        updateextblk();
+
+       // VB
+       if ((reg == 0x1cc || reg == 0x1ce) && (beamcon0 & BEAMCON0_VARVBEN)) {
+               // check VB and HB changes only if there are no many changes per frame
+               varsync_maybe_changed[0]++;
+       }
+       // HB
+       if ((reg == 0x1c4 || reg == 0x1c6) && exthblank) {
+               // check VB and HB changes only if there are no many changes per frame
+               varsync_maybe_changed[1]++;
+       }
+
        if (!resync) {
                return;
        }
+
        // TOTAL
        if ((reg == 0x1c0 || reg == 0x1c8) && (beamcon0 & BEAMCON0_VARBEAMEN)) {
                varsync_changed = 1;
@@ -8949,6 +8962,12 @@ static void varsync(int reg, bool resync)
        if ((reg == 0x1de || reg == 0x1c2) && (beamcon0 & bemcon0_hsync_mask)) {
                varsync_changed = 1;
        }
+
+       if (varsync_changed) {
+               varsync_maybe_changed[0] = 0;
+               varsync_maybe_changed[1] = 0;
+       }
+
        if (varsync_changed) {
                init_beamcon0(false);
        }
@@ -11131,7 +11150,7 @@ static void update_copper(int until_hpos)
                                int comp = coppercomp(hpos, true);
                                if (comp < 0) {
                                        // If we need to wait for later scanline or blitter: no need to emulate copper cycle-by-cycle
-                                       if (cop_state.ir[0] == 0xFFFF && cop_state.ir[1] == 0xFFFE) {
+                                       if (cop_state.ir[0] == 0xFFFF && cop_state.ir[1] == 0xFFFE && maxhpos < 250) {
                                                cop_state.state = COP_waitforever;
                                        }
                                        copper_enabled_thisline = 0;
@@ -12208,7 +12227,9 @@ static void vsync_display_render(void)
 
 static void vsync_check_vsyncmode(void)
 {
-       if (varsync_changed == 1) {
+       if ((varsync_maybe_changed[0] >= 1 && varsync_maybe_changed[0] <= 4) || (varsync_maybe_changed[1] >= 1 && varsync_maybe_changed[1] <= 4)) {
+               init_hz_normal();
+       } else if (varsync_changed == 1) {
                init_hz_normal();
        } else if (vpos_count > 0 && abs(vpos_count - vpos_count_diff) > 1 && vposw_change && vposw_change < 4) {
                init_hz_vposw();
@@ -12219,6 +12240,8 @@ static void vsync_check_vsyncmode(void)
        if (varsync_changed > 0) {
                varsync_changed--;
        }
+       varsync_maybe_changed[0] = 0;
+       varsync_maybe_changed[1] = 0;
 }
 
 static void check_display_mode_change(void)