From 123e732a7dd1511229931def505b900941b526a4 Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Tue, 5 May 2026 18:39:58 +0300
Subject: [PATCH] Removed obsolete variables

---
 custom.cpp          | 12 +-----------
 drawing.cpp         |  2 --
 include/xwin.h      |  3 ---
 specialmonitors.cpp |  2 --
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/custom.cpp b/custom.cpp
index 416f697e..3292b2fc 100644
--- a/custom.cpp
+++ b/custom.cpp
@@ -1651,7 +1651,6 @@ static void update_display_vars(void)
 	}
 
 	vb->inwidth = (current_linear_hpos_short - (display_hstart_cyclewait_skip_start + display_hstart_cyclewait_skip_end)) << (res2 + 1);
-	vb->inwidth2 = vb->inwidth;
 	vb->extrawidth = -2;
 	if (currprefs.gfx_extrawidth > 0) {
 		vb->extrawidth = currprefs.gfx_extrawidth << res2;
@@ -1676,7 +1675,6 @@ static void update_display_vars(void)
 		linear_vpos_vb_end = 0;
 	}
 	vb->inheight = maxv << vres2;
-	vb->inheight2 = vb->inheight;
 	vb->inxoffset = 0;
 
 	if (currprefs.gfx_overscanmode >= OVERSCANMODE_ULTRA) {
@@ -1696,12 +1694,8 @@ static void update_display_vars(void)
 
 	if (vb->inwidth < 16)
 		vb->inwidth = 16;
-	if (vb->inwidth2 < 16)
-		vb->inwidth2 = 16;
 	if (vb->inheight < 1)
 		vb->inheight = 1;
-	if (vb->inheight2 < 1)
-		vb->inheight2 = 1;
 
 	if (!vb->hardwiredpositioning) {
 		vb->outwidth = vb->inwidth;
@@ -1729,13 +1723,9 @@ static void update_display_vars(void)
 
 	if (vb->inwidth > vb->width_allocated)
 		vb->inwidth = vb->width_allocated;
-	if (vb->inwidth2 > vb->width_allocated)
-		vb->inwidth2 = vb->width_allocated;
-
+	
 	if (vb->inheight > vb->height_allocated)
 		vb->inheight = vb->height_allocated;
-	if (vb->inheight2 > vb->height_allocated)
-		vb->inheight2 = vb->height_allocated;
 
 	if (vb->outwidth > vb->width_allocated)
 		vb->outwidth = vb->width_allocated;
diff --git a/drawing.cpp b/drawing.cpp
index 990abfd4..e98cf264 100644
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -1987,8 +1987,6 @@ static void setnativeposition(struct vidbuffer *vb)
 	struct vidbuf_description *vidinfo = &adisplays[0].gfxvidinfo;
 	vb->inwidth = vidinfo->inbuffer->inwidth;
 	vb->inheight = vidinfo->inbuffer->inheight;
-	vb->inwidth2 = vidinfo->inbuffer->inwidth2;
-	vb->inheight2 = vidinfo->inbuffer->inheight2;
 	vb->outwidth = vidinfo->inbuffer->outwidth;
 	vb->outheight = vidinfo->inbuffer->outheight;
 }
diff --git a/include/xwin.h b/include/xwin.h
index cf103bab..2f06950c 100644
--- a/include/xwin.h
+++ b/include/xwin.h
@@ -102,9 +102,6 @@ struct vidbuffer
 	/* nominal size of image for centering */
 	int inwidth;
 	int inheight;
-	/* same but doublescan multiplier included */
-	int inwidth2;
-	int inheight2;
 	/* static, hardwired screen position and size (A2024) */
 	bool hardwiredpositioning;
 	/* extra width, chipset hpos extra in right border */
diff --git a/specialmonitors.cpp b/specialmonitors.cpp
index db082306..2f35ef49 100755
--- a/specialmonitors.cpp
+++ b/specialmonitors.cpp
@@ -93,8 +93,6 @@ static bool specialmonitor_setresolution(struct vidbuffer *src, struct vidbuffer
 	dst->outheight = height;
 	dst->inwidth = width;
 	dst->inheight = height;
-	dst->inwidth2 = width;
-	dst->inheight2 = height;
 	src->hardwiredpositioning = !nativeposition;
 	dst->hardwiredpositioning = !nativeposition;
 
-- 
2.47.3