From 4ea24edaf352a3f7a995fc167f8b76bd9ffcb863 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sat, 26 Jun 2004 17:20:35 +0000
Subject: [PATCH] Fix video_vosf_init() for BasiliskII/SDL

---
 BasiliskII/src/SDL/video_sdl.cpp | 3 +--
 BasiliskII/src/Unix/video_blit.h | 2 ++
 BasiliskII/src/Unix/video_vosf.h | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BasiliskII/src/SDL/video_sdl.cpp b/BasiliskII/src/SDL/video_sdl.cpp
index e66adb48..c5c86ae1 100644
--- a/BasiliskII/src/SDL/video_sdl.cpp
+++ b/BasiliskII/src/SDL/video_sdl.cpp
@@ -638,8 +638,7 @@ driver_window::driver_window(SDL_monitor_desc &m)
 	}
 	else if (!video_vosf_profitable()) {
 		video_vosf_exit();
-		// WarningAlert(STR_VOSF_NOT_PROFITABLE_WARN);
-		printf("VOSF acceleration is not profitable on this platform\n");
+		printf("VOSF acceleration is not profitable on this platform, disabling it\n");
 		use_vosf = false;
 	}
 	if (!use_vosf) {
diff --git a/BasiliskII/src/Unix/video_blit.h b/BasiliskII/src/Unix/video_blit.h
index 09c6ac5e..2946289e 100644
--- a/BasiliskII/src/Unix/video_blit.h
+++ b/BasiliskII/src/Unix/video_blit.h
@@ -47,6 +47,7 @@ enum {
 };
 #define VIDEO_MODE				VideoInfo
 #define VIDEO_MODE_INIT			VideoInfo const & mode = VModes[cur_mode]
+#define VIDEO_MODE_INIT_MONITOR	VIDEO_MODE_INIT
 #define VIDEO_MODE_ROW_BYTES	mode.viRowBytes
 #define VIDEO_MODE_X			mode.viXsize
 #define VIDEO_MODE_Y			mode.viYsize
@@ -63,6 +64,7 @@ enum {
 };
 #define VIDEO_MODE				video_mode
 #define VIDEO_MODE_INIT			video_mode const & mode = drv->mode
+#define VIDEO_MODE_INIT_MONITOR	video_mode const & mode = monitor.get_current_mode()
 #define VIDEO_MODE_ROW_BYTES	mode.bytes_per_row
 #define VIDEO_MODE_X			mode.x
 #define VIDEO_MODE_Y			mode.y
diff --git a/BasiliskII/src/Unix/video_vosf.h b/BasiliskII/src/Unix/video_vosf.h
index 18585f98..f34b9b02 100644
--- a/BasiliskII/src/Unix/video_vosf.h
+++ b/BasiliskII/src/Unix/video_vosf.h
@@ -225,7 +225,7 @@ static bool video_vosf_profitable(void)
 
 static bool video_vosf_init(MONITOR_INIT)
 {
-	VIDEO_MODE_INIT;
+	VIDEO_MODE_INIT_MONITOR;
 
 	const uintptr page_size = getpagesize();
 	const uintptr page_mask = page_size - 1;