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

SDL: Let driver_base be reused in a different video mode

Browse Source 
Split init() into one-time initialization, and adaptation to a new video mode.
This commit is contained in:
Dave Vasilevsky 2013-04-24 02:07:20 -04:00
parent e9c913c4ae
commit ff423fe7c9
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,9 +600,12 @@ static void migrate_screen_prefs(void)
class driver_base { class driver_base {
public: public:
driver_base(SDL_monitor_desc &m); driver_base(SDL_monitor_desc &m);
void init();
~driver_base(); ~driver_base();
void init(); // One-time init
void set_video_mode(int flags);
void adapt_to_video_mode();
void update_palette(void); void update_palette(void);
void suspend(void) {} void suspend(void) {}
void resume(void) {} void resume(void) {}
@ -641,25 +644,26 @@ driver_base::driver_base(SDL_monitor_desc &m)
the_buffer_copy = NULL; the_buffer_copy = NULL;
} }
void driver_base::init() void driver_base::set_video_mode(int flags)
{ {
int aligned_height = (VIDEO_MODE_Y + 15) & ~15; int aligned_height = (VIDEO_MODE_Y + 15) & ~15;
int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH); int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
int width = VIDEO_MODE_X, height = VIDEO_MODE_Y; if ((s = SDL_SetVideoMode(VIDEO_MODE_X, VIDEO_MODE_Y, depth,
SDL_HWSURFACE | flags)) == NULL)
ADBSetRelMouseMode(mouse_grabbed);
// Create surface
int flags = SDL_HWSURFACE;
if (display_type == DISPLAY_SCREEN)
flags |= SDL_FULLSCREEN;
if ((s = SDL_SetVideoMode(width, height, depth, flags)) == NULL)
return; return;
#ifdef ENABLE_VOSF
the_host_buffer = (uint8 *)s->pixels;
#endif
}
void driver_base::init()
{
set_video_mode(display_type == DISPLAY_SCREEN ? SDL_FULLSCREEN : 0);
int aligned_height = (VIDEO_MODE_Y + 15) & ~15;
#ifdef ENABLE_VOSF #ifdef ENABLE_VOSF
use_vosf = true; use_vosf = true;
// Allocate memory for frame buffer (SIZE is extended to page-boundary) // Allocate memory for frame buffer (SIZE is extended to page-boundary)
the_host_buffer = (uint8 *)s->pixels;
the_buffer_size = page_extend((aligned_height + 2) * s->pitch); the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
the_buffer_copy = (uint8 *)malloc(the_buffer_size); the_buffer_copy = (uint8 *)malloc(the_buffer_size);
@ -689,10 +693,19 @@ void driver_base::init()
D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy)); D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
} }
// Set frame buffer base
set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
adapt_to_video_mode();
}
void driver_base::adapt_to_video_mode() {
ADBSetRelMouseMode(false);
// Init blitting routines // Init blitting routines
SDL_PixelFormat *f = s->format; SDL_PixelFormat *f = s->format;
VisualFormat visualFormat; VisualFormat visualFormat;
visualFormat.depth = depth; visualFormat.depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
visualFormat.Rmask = f->Rmask; visualFormat.Rmask = f->Rmask;
visualFormat.Gmask = f->Gmask; visualFormat.Gmask = f->Gmask;
visualFormat.Bmask = f->Bmask; visualFormat.Bmask = f->Bmask;
@ -703,8 +716,6 @@ void driver_base::init()
for (int i=0; i<256; i++) for (int i=0; i<256; i++)
ExpandMap[i] = SDL_MapRGB(f, i, i, i); ExpandMap[i] = SDL_MapRGB(f, i, i, i);
// Set frame buffer base
set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
bool hardware_cursor = false; bool hardware_cursor = false;
#ifdef SHEEPSHAVER #ifdef SHEEPSHAVER