From: Toni Wilen Date: Sat, 1 Jan 2022 17:03:18 +0000 (+0200) Subject: 4910b3 X-Git-Tag: 4910~28 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=e41a2efbd28a73ce757bb5528a40e001b2b80cad;p=francis%2Fwinuae.git 4910b3 --- diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index af9d526e..d14ebba9 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1423,7 +1423,7 @@ BEGIN VALUE "FileDescription", "WinUAE" VALUE "FileVersion", "4.9.1.0" VALUE "InternalName", "WinUAE" - VALUE "LegalCopyright", "© 1996-2021 under the GNU Public License (GPL)" + VALUE "LegalCopyright", "© 1996-2022 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" VALUE "ProductVersion", "4.9.1.0" diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index 0afd5e22..e7de0311 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -3628,7 +3628,7 @@ void logging_init (void) SystemInfo.wProcessorArchitecture, SystemInfo.wProcessorLevel, SystemInfo.wProcessorRevision, SystemInfo.dwNumberOfProcessors, filedate, os_touch); write_log (_T("\n(c) 1995-2001 Bernd Schmidt - Core UAE concept and implementation.") - _T("\n(c) 1998-2021 Toni Wilen - Win32 port, core code updates.") + _T("\n(c) 1998-2022 Toni Wilen - Win32 port, core code updates.") _T("\n(c) 1996-2001 Brian King - Win32 port, Picasso96 RTG, and GUI.") _T("\n(c) 1996-1999 Mathias Ortmann - Win32 port and bsdsocket support.") _T("\n(c) 2000-2001 Bernd Meyer - JIT engine.") diff --git a/od-win32/win32.h b/od-win32/win32.h index 188727f7..3bb6442c 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -20,12 +20,12 @@ #define LANG_DLL_FULL_VERSION_MATCH 0 #if WINUAEPUBLICBETA -#define WINUAEBETA _T("Beta 2") +#define WINUAEBETA _T("Beta 3") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2021, 12, 20) +#define WINUAEDATE MAKEBD(2022, 1, 1) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 4cd5d5fa..2850162e 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -19654,7 +19654,6 @@ struct filterpreset { }; static const struct filterpreset filterpresets[] = { - { _T("PAL"), UAE_FILTER_PAL, 0, 0, 0, 0, 0, 0, 0, 50, 0, 0, 1, 1, 0, 0, 0, 10, 0, 0, 0, 300, 30, 0, 0, 0, 0, 0 }, { _T("D3D Autoscale"), UAE_FILTER_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 4, 0, 0 }, { _T("D3D Full Scaling"), UAE_FILTER_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0 }, { NULL } diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 0c0ae586..81e5f00e 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,22 @@ +Beta 3 + +- "Manual" BPL1DAT write disabling border timing updated. Also OCS Denise limit was not checked, OCS Denise ignores BPL1DAT writes until hblank end. (OCS Denise: border is forced to enabled state during hblank start to hblank end, ECS Denise/AGA: border is enabled when hblank starts). +- "Manual" BPL1DAT write between hblank start and hsync start: border didn't open. Now it does. ECS Denise/AGA only. +- If Remove interlace artifacts is enabled, last border lines now have correct color (border color or black). 4.9.0 had temporary hack that always used black. +- OCS Denise topmost line (Line that is mostly black, except tiny part of border color in right border) had off by one line bug. +- Reset blitter before loading state file. 4.9 new blitter emulation didn't reset all registers fully, loading state file on the fly might have caused corruption due to blitter not being fully reset. +- Programmed mode display size calculation modified. 4.4 and earlier used both horizontal sync and horizontal blank to calculate internal width and horizonta position. 4.9.0 used only more accurate way but only used horizontal sync. This caused some modes to be too wide internally (wrong aspect ratio) and/or have horizontal offset. Horizontal blank and sync is again used to calculate width and position if normal overscan mode. Higher overscan modes use only hsync (allows glitch-free emulation of hblank "effects", if something someday does it.. Hblank can be moved without causing display resync.) +- 4.9.0b40 blitter final D update was incomplete, final D is not skipped immediately when BLTSIZE is written to but when apparently blitter when sequencer starts. +- Hardfile images less than 4M are now mounted correctly as hardfiles when drag and dropped if file has common HDF extension (HDF/HDZ/VHD). +- Removed "PAL" filter preset. It has been unsupported since long time ago.. +- Epson printer emulation does not anymore print each page as a separate document. +- Added IDE scsi.device disable hack. Removes ROM scsi.device from exec ResModules list, does not modify ROM. UAE boot ROM must be enabled. Config file only scsidevice_disable=true. Disabling is not done if any IDE device is added to A600/A1200/A4000 IDE or indirect ROM mode is enabled. Makes booting noticeably quicker on OS39 and newer KS versions if mainboard IDE is not needed. + +If BPL1DAT write disables border and active sprite was hidden behind the border: +- OCS Denise: sprite is visible 1 lores pixel (2 hires) earlier than bitplane first pixel. +- ECS Denise: sprite is visible 2 lores pixels (4 hires) earlier than bitplane first pixel. +- AGA: sprite is visible 1.5 lores pixels (3 hires) earlier than bitplane first pixel. (This requires subpixel mode, without subpixel it becomes 1 lores pixel) Beta 2: @@ -6,7 +24,7 @@ Beta 2: - Adjusted copper emulation, waits for too large horizontal position woke up normally. - Delay warp mode automatic key release by few frames, some programs might not like immediate keypress/release pair. - Windows event processing change fix. -- Border "bug" emulated (ECS Denise and AGA, does not affect OCS Denise). If bitplane DMA (BPL1DAT) happens inside VBLANK, border state gets disabled, when first non-VB line starts, line stripe from HDIW start to first BPL1DAT is still in "not border" state: sprites are visible and borderblank does not affect it. This happens because border state normally gets enabled when HBLANK goes from inactive to active stae but it looks like HBLANK does not affect border state inside VBLANK. It can also happen during later scanlines if programmed HBLANK starts too early, before last BPL1DAT access. (HBLANK enables border, BPL1DAT access disables it again). +- Border "bug" emulated (ECS Denise and AGA, does not affect OCS Denise). If bitplane DMA (BPL1DAT) happens inside VBLANK, border state gets disabled, when first non-VB line starts, line stripe from HDIW start to first BPL1DAT is still in "not border" state: sprites are visible and borderblank does not affect it. This happens because border state normally gets enabled when HBLANK goes from inactive to active state but it looks like HBLANK does not affect border state inside VBLANK. It can also happen during later scanlines if programmed HBLANK starts too early, before last BPL1DAT access. (HBLANK enables border, BPL1DAT access disables it again). Beta 1: