Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-06-12 04:29:29 +00:00
Code Issues Projects Releases Wiki Activity

fixed issue #21, "BasiliskII, Win32: resizing a window does not stretch screen"

Browse Source
This commit is contained in:
David Ludwig 2017-08-19 17:45:26 -04:00
parent e49cd855c2
commit 5d4560c1a7
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
BasiliskII/src/SDL/video_sdl.cpp
View File

@ -133,6 +133,7 @@ SDL_Window * sdl_window = NULL; // Wraps an OS-native window
static SDL_Surface * host_surface = NULL; // Surface in host-OS display format static SDL_Surface * host_surface = NULL; // Surface in host-OS display format
static SDL_Surface * guest_surface = NULL; // Surface in guest-OS display format static SDL_Surface * guest_surface = NULL; // Surface in guest-OS display format
static SDL_Renderer * sdl_renderer = NULL; // Handle to SDL2 renderer static SDL_Renderer * sdl_renderer = NULL; // Handle to SDL2 renderer
static SDL_threadID sdl_renderer_thread_id = 0; // Thread ID where the SDL_renderer was created, and SDL_renderer ops should run (for compatibility w/ d3d9)
static SDL_Texture * sdl_texture = NULL; // Handle to a GPU texture, with which to draw guest_surface to static SDL_Texture * sdl_texture = NULL; // Handle to a GPU texture, with which to draw guest_surface to
static int screen_depth; // Depth of current screen static int screen_depth; // Depth of current screen
//static SDL_Cursor *sdl_cursor; // Copy of Mac cursor //static SDL_Cursor *sdl_cursor; // Copy of Mac cursor
@ -165,6 +166,7 @@ static void (*video_refresh)(void);
// Prototypes // Prototypes
static int redraw_func(void *arg); static int redraw_func(void *arg);
static int update_sdl_video(); static int update_sdl_video();
static int present_sdl_video();
// From sys_unix.cpp // From sys_unix.cpp
extern void SysMountFirstFloppy(void); extern void SysMountFirstFloppy(void);
@ -742,6 +744,7 @@ static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags
shutdown_sdl_video(); shutdown_sdl_video();
return NULL; return NULL;
} }
sdl_renderer_thread_id = SDL_ThreadID();
} }
SDL_assert(sdl_texture == NULL); SDL_assert(sdl_texture == NULL);
@ -807,13 +810,21 @@ static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags
return guest_surface; return guest_surface;
} }
static int update_sdl_video() static int present_sdl_video()
{ {
if (!sdl_renderer || !sdl_texture || !guest_surface) { if (!sdl_renderer || !sdl_texture || !guest_surface) {
printf("WARNING: A video mode does not appear to have been set.\n"); printf("WARNING: A video mode does not appear to have been set.\n");
return -1; return -1;
} }
// Some systems, such as D3D9, can fail if and when they are used across
// certain operations. To address this, only utilize SDL_Renderer in a
// single thread, preferably the main thread.
//
// This was added as part of a fix for https://github.com/DavidLudwig/macemu/issues/21
// "BasiliskII, Win32: resizing a window does not stretch "
SDL_assert(SDL_ThreadID() == sdl_renderer_thread_id);
// Make sure the display's internal (to SDL, possibly the OS) buffer gets // Make sure the display's internal (to SDL, possibly the OS) buffer gets
// cleared. Not doing so can, if and when letterboxing is applied (whereby // cleared. Not doing so can, if and when letterboxing is applied (whereby
// colored bars are drawn on the screen's sides to help with aspect-ratio // colored bars are drawn on the screen's sides to help with aspect-ratio
@ -845,10 +856,28 @@ static int update_sdl_video()
return 0; return 0;
} }
static int update_sdl_video()
{
// HACK, dludwig@pobox.com: for now, just update the whole screen, via
// VideoInterrupt(), which gets called on the main thread.
//
// TODO: make sure SDL_Renderer resources get displayed, if and when
// MacsBug is running (and VideoInterrupt() might not get called)
//
// TODO: cache rects to update, then use rects in present_sdl_video()
return 0;
}
static int update_sdl_video(SDL_Surface *s, int x, int y, int w, int h) static int update_sdl_video(SDL_Surface *s, int x, int y, int w, int h)
{ {
// HACK, dludwig@pobox.com: for now, just update the whole screen // HACK, dludwig@pobox.com: for now, just update the whole screen, via
return update_sdl_video(); // VideoInterrupt(), which gets called on the main thread.
//
// TODO: make sure SDL_Renderer resources get displayed, if and when
// MacsBug is running (and VideoInterrupt() might not get called)
//
// TODO: cache rects to update, then use rects in present_sdl_video()
return 0;
} }
void driver_base::set_video_mode(int flags) void driver_base::set_video_mode(int flags)
@ -1518,6 +1547,8 @@ void VideoInterrupt(void)
if (toggle_fullscreen) if (toggle_fullscreen)
do_toggle_fullscreen(); do_toggle_fullscreen();
present_sdl_video();
// Temporarily give up frame buffer lock (this is the point where // Temporarily give up frame buffer lock (this is the point where
// we are suspended when the user presses Ctrl-Tab) // we are suspended when the user presses Ctrl-Tab)
UNLOCK_FRAME_BUFFER; UNLOCK_FRAME_BUFFER;