From 66a561fe186691dc578f15d2261b9919d03faa7e Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Wed, 21 May 2025 19:35:19 +0300
Subject: [PATCH] 6000b28

---
 custom.cpp                   | 35 ++---------------------------------
 od-win32/win32.h             |  4 ++--
 od-win32/winuaechangelog.txt |  7 +++++++
 3 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/custom.cpp b/custom.cpp
index bcb24523..325f164f 100644
--- a/custom.cpp
+++ b/custom.cpp
@@ -11618,7 +11618,7 @@ static void check_hsyncs_hardwired(void)
 
 	if (realpal) {
 
-		// Vertival SYNC
+		// Vertical SYNC
 		if (is_shs) { // SHS
 			if (vpos == 3 && lof_store) {
 				agnus_vsync = true;
@@ -11664,7 +11664,7 @@ static void check_hsyncs_hardwired(void)
 
 	} else {
 
-		// Vertival SYNC
+		// Vertical SYNC
 		if (is_shs) { // SHS
 			if (vpos == 3 && lof_store) {
 				agnus_vsync = true;
@@ -12292,37 +12292,6 @@ static void sync_equalline_handler(void)
 		int rdc = rga_denise_cycle;
 		do_draw_line();
 		rga_denise_cycle = rdc;
-
-#if 0
-
-		if (doflickerfix_active()) {
-			int lvpos = linear_vpos - 1;
-			struct linestate *l = &lines[lvpos][lof_display];
-			if (scandoubled_bpl_ena[lvpos]) {
-				int planes = GET_PLANES(l->bplcon0);
-				lof_display ^= 1;
-				struct linestate *l2 = &lines[lvpos][lof_display];
-				scandoubled_line = 1;
-				uaecptr bplptx[MAX_PLANES];
-				bool skip = false;
-				for (int i = 0; i < planes; i++) {
-					uaecptr li1 = scandoubled_bpl_ptr[lvpos][lof_store][i];
-					uaecptr li2 = scandoubled_bpl_ptr[lvpos][lof_store ^ 1][i];
-					skip = !li1 || !li2 || li1 == 0xffffffff || li2 == 0xffffffff;
-					bplptx[i] = bplpt[i] - li1 + li2;
-				}
-				if (skip) {
-					draw_border_fast(l, linear_display_vpos + 1);
-				} else {
-					draw_line_fast(l2, linear_display_vpos + 1, bplptx, false);
-				}
-				scandoubled_line = 0;
-				lof_display ^= 1;
-			}
-		}
-
-#endif
-
 	} else {
 		denise_handle_quick_strobe_queue(str, display_hstart_fastmode, rga_denise_cycle);
 		next_denise_rga();
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 3df4adc4..27344d19 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("27")
+#define WINUAEBETA _T("28")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2025, 5, 12)
+#define WINUAEDATE MAKEBD(2025, 5, 21)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 4d78bf35..55b8626c 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,11 @@
 
+Beta 28:
+
+- Display panel Overscan TV modes didn't do anything if "No scaling" filtering mode was selected.
+- Fixed Remove interlace artifacts last line flicker in some overscan modes and "out of sync" line when drawing mode changed from accurate to fast mode.
+- Removed Chipset panel Subpixel emulation checbox. v6 emulation is always subpixel perfect in accurate modes. Config file support is not removed. (backwards compatibility)
+- Only known Apollo 500/2000 boot ROM seems to only support AT500/AT2000 variant, driver does not initialize if hardware SCSI config bit is set. Now SCSI is disabled by default (making it AT500/AT2000), option added to Expansions panel. Possibly got broken when Apollo accelerators got supported or updated which use exact same SCSI hardware.
+
 Beta 27:
 
 - Interlace timing was broken, fast drawing mode calculations affected non-fast modes. (b26)
-- 
2.47.3