From 32fb043210bd098f2d2ab9b7c822a0a536b312c5 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Thu, 4 Apr 2024 21:21:01 +0300 Subject: [PATCH] OCS Denise/A1000 Denise first non-blank line update --- custom.cpp | 9 ++++++--- drawing.cpp | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/custom.cpp b/custom.cpp index a5c917e9..2b7bcf65 100644 --- a/custom.cpp +++ b/custom.cpp @@ -6726,6 +6726,11 @@ static void updateextblk(void) if (!exthblank) { hbstrt_v2 = (8 << CCK_SHRES_SHIFT) - 3; hbstop_v2 = (47 << CCK_SHRES_SHIFT) - 7; + if (denisea1000) { + hbstop_v2 = (47 << CCK_SHRES_SHIFT) - 7; + } else if (!ecs_denise) { + hbstop_v2 = (47 << CCK_SHRES_SHIFT) - 3; + } hbstrt_v2 = adjust_hr(hbstrt_v2); hbstop_v2 = adjust_hr(hbstop_v2); } @@ -6840,9 +6845,7 @@ static void updateextblk(void) denisehtotal <<= CCK_SHRES_SHIFT; // ECS Denise has 1 extra lores pixel in right border - if (currprefs.gfx_overscanmode >= OVERSCANMODE_ULTRA) { - denisehtotal += 2 << (CCK_SHRES_SHIFT - 1); - } else if (ecs_denise) { + if (ecs_denise) { denisehtotal += 1 << (CCK_SHRES_SHIFT - 1); } diff --git a/drawing.cpp b/drawing.cpp index c9f4b919..644b60a8 100644 --- a/drawing.cpp +++ b/drawing.cpp @@ -655,6 +655,11 @@ static void set_hblanking_limits(void) bool doblank = false; int hbstrt = ((maxhpos_short + 8) << CCK_SHRES_SHIFT) - 3; int hbstop = (47 << CCK_SHRES_SHIFT) - 7; + if (denisea1000) { + hbstop = (47 << CCK_SHRES_SHIFT) - 7; + } else if (!ecs_denise) { + hbstop = (47 << CCK_SHRES_SHIFT) - 3; + } if (currprefs.gfx_overscanmode < OVERSCANMODE_OVERSCAN) { int mult = (OVERSCANMODE_OVERSCAN - currprefs.gfx_overscanmode) * 4; -- 2.47.3