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

Try to fix 16 bpp over 32 bpp on MacOS X.

Browse Source
This commit is contained in:
gbeauche 2004-07-27 21:40:52 +00:00
parent 4f78562642
commit bfd1c7b659
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,7 +324,7 @@ static inline int bytes_per_pixel(int depth)
} }
// Map video_mode depth ID to numerical depth value // Map video_mode depth ID to numerical depth value
static int sdl_depth_of_video_depth(int video_depth) static int mac_depth_of_video_depth(int video_depth)
{ {
int depth = -1; int depth = -1;
switch (video_depth) { switch (video_depth) {
@ -352,6 +352,12 @@ static int sdl_depth_of_video_depth(int video_depth)
return depth; return depth;
} }
// Map video_mode depth ID to SDL screen depth
static int sdl_depth_of_video_depth(int video_depth)
{
return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
}
// Check wether specified mode is available // Check wether specified mode is available
static bool has_mode(int type, int width, int height) static bool has_mode(int type, int width, int height)
{ {
@ -617,7 +623,7 @@ driver_window::driver_window(SDL_monitor_desc &m)
ADBSetRelMouseMode(mouse_grabbed); ADBSetRelMouseMode(mouse_grabbed);
// Create surface // Create surface
int depth = ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth); int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL) if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
return; return;
@ -675,7 +681,7 @@ driver_window::driver_window(SDL_monitor_desc &m)
visualFormat.Rmask = f->Rmask; visualFormat.Rmask = f->Rmask;
visualFormat.Gmask = f->Gmask; visualFormat.Gmask = f->Gmask;
visualFormat.Bmask = f->Bmask; visualFormat.Bmask = f->Bmask;
Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH)); Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
// Load gray ramp to 8->16/32 expand map // Load gray ramp to 8->16/32 expand map
if (!IsDirectMode(mode)) if (!IsDirectMode(mode))
@ -954,7 +960,7 @@ bool VideoInit(bool classic)
add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT); add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
else { else {
for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) { for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d)); int bpp = sdl_depth_of_video_depth(d);
if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE)) if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
add_window_modes(video_depth(d)); add_window_modes(video_depth(d));
} }