From 391bd6ff7e26c76f88457906ca2897f035e0dd9e Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Sun, 16 Aug 2020 17:20:52 +0200 Subject: [PATCH 1/5] Updated VisualGDB settings --- .../Amiberry/Amiberry-Debug-dispmanx.vgdbsettings | 10 ++++++++-- VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings | 10 ++++++++-- .../Amiberry/Amiberry-Release-dispmanx.vgdbsettings | 10 ++++++++-- VisualGDB/Amiberry/Amiberry-Release.vgdbsettings | 10 ++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings index 5501309e..add298e1 100644 --- a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings @@ -53,10 +53,16 @@ - Unknown + False true true + + Enabled + true + true + true + true @@ -94,7 +100,7 @@ main true false - false + true false 0 true diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings index 2a4bea8d..1b6c57f9 100644 --- a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings @@ -53,10 +53,16 @@ - Unknown + False true true + + Enabled + true + true + true + true @@ -94,7 +100,7 @@ main true false - false + true false 0 true diff --git a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings index f2aaff62..35bd8e02 100644 --- a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings @@ -53,10 +53,16 @@ - Unknown + False true true + + Enabled + true + true + true + true @@ -94,7 +100,7 @@ main true false - false + true false 0 true diff --git a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings index 165037a0..e789b863 100644 --- a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings +++ b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings @@ -53,10 +53,16 @@ - Unknown + False true true + + Enabled + true + true + true + true @@ -94,7 +100,7 @@ main true false - false + true false 0 true From 711c22f49e8315d8a89ccf24a4e2dcf4f2ee151c Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Sun, 16 Aug 2020 17:39:49 +0200 Subject: [PATCH 2/5] Remove check for display height before allowing line doubling --- src/osdep/amiberry.cpp | 4 ---- src/osdep/amiberry_gfx.cpp | 2 -- src/osdep/amiberry_gfx.h | 1 - 3 files changed, 7 deletions(-) diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp index 7552518b..d5797487 100644 --- a/src/osdep/amiberry.cpp +++ b/src/osdep/amiberry.cpp @@ -368,10 +368,6 @@ void target_fixup_options(struct uae_prefs* p) p->picasso96_modeflags = RGBFF_CLUT | RGBFF_R5G6B5PC | RGBFF_R8G8B8A8; - if (p->gfx_vresolution && !can_have_linedouble) - // If there's not enough vertical space, cancel Line Doubling/Scanlines - p->gfx_vresolution = 0; - if (p->cachesize <= 0) p->compfpu = false; diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp index c248b946..c9619716 100644 --- a/src/osdep/amiberry_gfx.cpp +++ b/src/osdep/amiberry_gfx.cpp @@ -59,7 +59,6 @@ static int display_width; static int display_height; static int display_depth; Uint32 pixel_format; -bool can_have_linedouble; static unsigned long last_synctime; static int host_hz = 50; @@ -401,7 +400,6 @@ int graphics_setup(void) { write_log("Current Display mode: bpp %i\t%s\t%i x %i\t%iHz\n", SDL_BITSPERPIXEL(current_mode.format), SDL_GetPixelFormatName(current_mode.format), current_mode.w, current_mode.h, current_mode.refresh_rate); host_hz = current_mode.refresh_rate; - can_have_linedouble = current_mode.h >= 540; } Uint32 sdl_window_mode; diff --git a/src/osdep/amiberry_gfx.h b/src/osdep/amiberry_gfx.h index bef3f632..c8c14096 100644 --- a/src/osdep/amiberry_gfx.h +++ b/src/osdep/amiberry_gfx.h @@ -35,7 +35,6 @@ extern SDL_Window* sdl_window; extern SDL_Surface* gui_screen; extern SDL_Rect renderQuad; -extern bool can_have_linedouble; extern void check_error_sdl(bool check, const char* message); extern void toggle_fullscreen(); extern void DX_Fill(int dstx, int dsty, int width, int height, uae_u32 color); From 7bfe3be5c3ff3481eb9a9dda81d870a9d06815ef Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Sun, 16 Aug 2020 17:40:13 +0200 Subject: [PATCH 3/5] Updated beta version date --- src/osdep/target.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osdep/target.h b/src/osdep/target.h index 19af305c..06b04ba3 100644 --- a/src/osdep/target.h +++ b/src/osdep/target.h @@ -22,8 +22,8 @@ #define GETBDM(x) (((x) - (((x) / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define AMIBERRYVERSION _T("Amiberry v3.2 beta (2020-08-14)") -#define AMIBERRYDATE MAKEBD(2020, 8, 14) +#define AMIBERRYVERSION _T("Amiberry v3.2 beta (2020-08-16)") +#define AMIBERRYDATE MAKEBD(2020, 8, 16) #define IHF_WINDOWHIDDEN 6 From ff105e713e80afccbbbdb50f9774892a98181dd2 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Sun, 16 Aug 2020 17:49:58 +0200 Subject: [PATCH 4/5] Fixed Dispmanx version as well --- src/osdep/amiberry_gfx.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp index c9619716..3c7a27ad 100644 --- a/src/osdep/amiberry_gfx.cpp +++ b/src/osdep/amiberry_gfx.cpp @@ -356,7 +356,6 @@ int graphics_setup(void) bcm_host_init(); displayHandle = vc_dispmanx_display_open(0); vc_dispmanx_display_get_info(displayHandle, &modeInfo); - can_have_linedouble = modeInfo.height >= 540; VCHI_INSTANCE_T vchi_instance; VCHI_CONNECTION_T* vchi_connection; From b80488413717834ad33468674af0d92669f4a7c3 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Sun, 16 Aug 2020 19:47:25 +0200 Subject: [PATCH 5/5] Handle more changed gfx settings --- src/osdep/amiberry_gfx.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp index 3c7a27ad..cab938f1 100644 --- a/src/osdep/amiberry_gfx.cpp +++ b/src/osdep/amiberry_gfx.cpp @@ -1103,15 +1103,26 @@ int check_prefs_changed_gfx() } #ifdef AMIBERRY - currprefs.gfx_apmode[0].gfx_fullscreen = changed_prefs.gfx_apmode[0].gfx_fullscreen; - currprefs.gfx_apmode[1].gfx_fullscreen = changed_prefs.gfx_apmode[1].gfx_fullscreen; currprefs.gfx_monitor.gfx_size_fs.width = changed_prefs.gfx_monitor.gfx_size_fs.width; currprefs.gfx_monitor.gfx_size_fs.height = changed_prefs.gfx_monitor.gfx_size_fs.height; currprefs.gfx_monitor.gfx_size_win.width = changed_prefs.gfx_monitor.gfx_size_win.width; currprefs.gfx_monitor.gfx_size_win.height = changed_prefs.gfx_monitor.gfx_size_win.height; currprefs.gfx_monitor.gfx_size.width = changed_prefs.gfx_monitor.gfx_size.width; currprefs.gfx_monitor.gfx_size.height = changed_prefs.gfx_monitor.gfx_size.height; + currprefs.gfx_monitor.gfx_size_win.x = changed_prefs.gfx_monitor.gfx_size_win.x; + currprefs.gfx_monitor.gfx_size_win.y = changed_prefs.gfx_monitor.gfx_size_win.y; + currprefs.gfx_apmode[0].gfx_fullscreen = changed_prefs.gfx_apmode[0].gfx_fullscreen; + currprefs.gfx_apmode[1].gfx_fullscreen = changed_prefs.gfx_apmode[1].gfx_fullscreen; + currprefs.gfx_apmode[0].gfx_vsync = changed_prefs.gfx_apmode[0].gfx_vsync; + currprefs.gfx_apmode[1].gfx_vsync = changed_prefs.gfx_apmode[1].gfx_vsync; + currprefs.gfx_apmode[0].gfx_vsyncmode = changed_prefs.gfx_apmode[0].gfx_vsyncmode; + currprefs.gfx_apmode[1].gfx_vsyncmode = changed_prefs.gfx_apmode[1].gfx_vsyncmode; + currprefs.gfx_apmode[0].gfx_refreshrate = changed_prefs.gfx_apmode[0].gfx_refreshrate; + + currprefs.rtg_horiz_zoom_mult = changed_prefs.rtg_horiz_zoom_mult; + currprefs.rtg_vert_zoom_mult = changed_prefs.rtg_vert_zoom_mult; + currprefs.gfx_auto_height = changed_prefs.gfx_auto_height; currprefs.gfx_correct_aspect = changed_prefs.gfx_correct_aspect; currprefs.scaling_method = changed_prefs.scaling_method;