Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-15 13:05:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #137 from rickyzhang82/pr-fix-sdl-in-24-bit-rom

Browse Source 
Fix 1 bit BW guest OS frame buffer in 8 bit per pixel SDL surface.
This commit is contained in:
asvitkine 2017-10-08 14:47:27 -04:00 committed by GitHub
commit 6bb9d00184
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
BasiliskII/src/CrossPlatform/video_blit.cpp
View File

@ -301,6 +301,27 @@ static void Blit_Copy_Raw(uint8 * dest, const uint8 * source, uint32 length)
#define FB_DEPTH 24 #define FB_DEPTH 24
#include "video_blit.h" #include "video_blit.h"
/* -------------------------------------------------------------------------- */
/* --- 1-bit indexed to 8-bit color mode conversion --- */
/* -------------------------------------------------------------------------- */
#define CONVERT_BW(byte) (byte)==1?0:255
static void Blit_Expand_1_To_8_Color(uint8 * dest, const uint8 * p, uint32 length)
{
uint8 *q = (uint8 *)dest;
for (uint32 i=0; i<length; i++) {
uint8 c = *p++;
*q++ = CONVERT_BW(c >> 7);
*q++ = CONVERT_BW((c >> 6) & 1);
*q++ = CONVERT_BW((c >> 5) & 1);
*q++ = CONVERT_BW((c >> 4) & 1);
*q++ = CONVERT_BW((c >> 3) & 1);
*q++ = CONVERT_BW((c >> 2) & 1);
*q++ = CONVERT_BW((c >> 1) & 1);
*q++ = CONVERT_BW(c & 1);
}
}
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
/* --- 1/2/4-bit indexed to 8-bit mode conversion --- */ /* --- 1/2/4-bit indexed to 8-bit mode conversion --- */
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
@ -577,9 +598,16 @@ bool Screen_blitter_init(VisualFormat const & visual_format, bool native_byte_or
} }
} }
#else #else
if (use_sdl_video && 1 == mac_depth && 8 == visual_format.depth) {
// A special case for 24 bit ROM in SDL:
// SDL allows minimum 8 bit per pixel color mode.
// Transform 1 bit per pixel BW mode from guest OS frame into SDL surface.
Screen_blit = Blit_Expand_1_To_8_Color;
} else {
// The UAE memory handlers will blit correctly // The UAE memory handlers will blit correctly
// --> no need for specialised blitters here // --> no need for specialised blitters here
Screen_blit = Blit_Copy_Raw; Screen_blit = Blit_Copy_Raw;
}
#endif #endif
// If the blitter simply reduces to a copy, we don't need VOSF in DGA mode // If the blitter simply reduces to a copy, we don't need VOSF in DGA mode