Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-02-17 06:31:14 +00:00
Code Issues Projects Releases Wiki Activity

test framebuffer handling

Browse Source
This commit is contained in:
kanjitalk755 2023-08-25 19:50:04 +09:00
parent d2c2647e3a
commit 0942bdcbf9
5 changed files with 73 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,7 +509,11 @@ static Screen_blit_func_info Screen_blitters[] = {
{ 16, 0x00f800, 0x0007e0, 0x00001f, Blit_RGB565_NBO , Blit_RGB565_OBO }, // OK (NBO) { 16, 0x00f800, 0x0007e0, 0x00001f, Blit_RGB565_NBO , Blit_RGB565_OBO }, // OK (NBO)
{ 24, 0xff0000, 0x00ff00, 0x0000ff, Blit_RGB888_NBO , Blit_Copy_Raw }, // OK (NBO) { 24, 0xff0000, 0x00ff00, 0x0000ff, Blit_RGB888_NBO , Blit_Copy_Raw }, // OK (NBO)
{ 24, 0x0000ff, 0x00ff00, 0xff0000, Blit_BGR888_NBO , Blit_BGR888_OBO }, // NT { 24, 0x0000ff, 0x00ff00, 0xff0000, Blit_BGR888_NBO , Blit_BGR888_OBO }, // NT
#ifdef ENABLE_VOSF
{ 32, 0xff0000, 0x00ff00, 0x0000ff, Blit_RGB888_NBO , Blit_Copy_Raw }, // OK (NBO) { 32, 0xff0000, 0x00ff00, 0x0000ff, Blit_RGB888_NBO , Blit_Copy_Raw }, // OK (NBO)
#else
{ 32, 0xff000000, 0x00ff0000, 0x0000ff00, Blit_RGB888_NBO , Blit_Copy_Raw }, // OK (NBO)
#endif
{ 32, 0x0000ff, 0x00ff00, 0xff0000, Blit_BGR888_NBO , Blit_BGR888_OBO }, // NT { 32, 0x0000ff, 0x00ff00, 0xff0000, Blit_BGR888_NBO , Blit_BGR888_OBO }, // NT
#endif #endif
{ 32, 0xff00, 0xff0000, 0xff000000, Blit_Copy_Raw , Blit_Copy_Raw } // OK { 32, 0xff00, 0xff0000, 0xff000000, Blit_Copy_Raw , Blit_Copy_Raw } // OK

83
BasiliskII/src/SDL/video_sdl2.cpp
View File

@ -629,7 +629,7 @@ public:
~driver_base(); ~driver_base();
void init(); // One-time init void init(); // One-time init
void set_video_mode(int flags); void set_video_mode(int flags, int pitch);
void adapt_to_video_mode(); void adapt_to_video_mode();
void update_palette(void); void update_palette(void);
@ -717,7 +717,7 @@ static int get_mag_rate()
return m < 1 ? 1 : m > 4 ? 4 : m; return m < 1 ? 1 : m > 4 ? 4 : m;
} }
static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags) static SDL_Surface *init_sdl_video(int width, int height, int depth, Uint32 flags, int pitch)
{ {
if (guest_surface) { if (guest_surface) {
delete_sdl_video_surfaces(); delete_sdl_video_surfaces();
@ -821,7 +821,11 @@ static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags
} }
SDL_assert(sdl_texture == NULL); SDL_assert(sdl_texture == NULL);
sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, width, height); #ifdef ENABLE_VOSF
sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, width, height);
#else
sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_BGRA8888, SDL_TEXTUREACCESS_STREAMING, width, height);
#endif
if (!sdl_texture) { if (!sdl_texture) {
shutdown_sdl_video(); shutdown_sdl_video();
return NULL; return NULL;
@ -833,19 +837,32 @@ static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags
SDL_assert(guest_surface == NULL); SDL_assert(guest_surface == NULL);
SDL_assert(host_surface == NULL); SDL_assert(host_surface == NULL);
switch (bpp) { switch (depth) {
case 8: case VIDEO_DEPTH_1BIT:
guest_surface = SDL_CreateRGBSurface(0, width, height, 8, 0, 0, 0, 0); case VIDEO_DEPTH_2BIT:
break; case VIDEO_DEPTH_4BIT:
case 16: guest_surface = SDL_CreateRGBSurface(0, width, height, 8, 0, 0, 0, 0);
guest_surface = SDL_CreateRGBSurface(0, width, height, 16, 0x0000F800, 0x000007E0, 0x0000001F, 0x00000000);
break; break;
case 32: case VIDEO_DEPTH_8BIT:
guest_surface = SDL_CreateRGBSurface(0, width, height, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000); #ifdef ENABLE_VOSF
host_surface = guest_surface; guest_surface = SDL_CreateRGBSurface(0, width, height, 8, 0, 0, 0, 0);
#else
guest_surface = SDL_CreateRGBSurfaceFrom(the_buffer, width, height, 8, pitch, 0, 0, 0, 0);
#endif
break;
case VIDEO_DEPTH_16BIT:
guest_surface = SDL_CreateRGBSurface(0, width, height, 16, 0xf800, 0x07e0, 0x001f, 0);
break;
case VIDEO_DEPTH_32BIT:
#ifdef ENABLE_VOSF
guest_surface = SDL_CreateRGBSurface(0, width, height, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
#else
guest_surface = SDL_CreateRGBSurfaceFrom(the_buffer, width, height, 32, pitch, 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff);
#endif
host_surface = guest_surface;
break; break;
default: default:
printf("WARNING: An unsupported bpp of %d was used\n", bpp); printf("WARNING: An unsupported depth of %d was used\n", depth);
break; break;
} }
if (!guest_surface) { if (!guest_surface) {
@ -933,14 +950,22 @@ static int present_sdl_video()
UNLOCK_PALETTE; // passed potential deadlock, can unlock palette UNLOCK_PALETTE; // passed potential deadlock, can unlock palette
// Update the host OS' texture // Update the host OS' texture
void * srcPixels = (void *)((uint8_t *)host_surface->pixels + uint8_t *srcPixels = (uint8_t *)host_surface->pixels +
sdl_update_video_rect.y * host_surface->pitch + sdl_update_video_rect.y * host_surface->pitch +
sdl_update_video_rect.x * host_surface->format->BytesPerPixel); sdl_update_video_rect.x * host_surface->format->BytesPerPixel;
if (SDL_UpdateTexture(sdl_texture, &sdl_update_video_rect, srcPixels, host_surface->pitch) != 0) { uint8_t *dstPixels;
SDL_UnlockMutex(sdl_update_video_mutex); int dstPitch;
if (SDL_LockTexture(sdl_texture, &sdl_update_video_rect, (void **)&dstPixels, &dstPitch) < 0) {
SDL_UnlockMutex(sdl_update_video_mutex);
return -1; return -1;
} }
for (int y = 0; y < sdl_update_video_rect.h; y++) {
memcpy(dstPixels, srcPixels, sdl_update_video_rect.w << 2);
srcPixels += host_surface->pitch;
dstPixels += dstPitch;
}
SDL_UnlockTexture(sdl_texture);
// We are done working with pixels in host_surface. Reset sdl_update_video_rect, then let // We are done working with pixels in host_surface. Reset sdl_update_video_rect, then let
// other threads modify it, as-needed. // other threads modify it, as-needed.
@ -1008,10 +1033,9 @@ static SDL_Cursor *MagCursor(bool hot) {
} }
#endif #endif
void driver_base::set_video_mode(int flags) void driver_base::set_video_mode(int flags, int pitch)
{ {
int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH); if ((s = init_sdl_video(VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_DEPTH, flags, pitch)) == NULL)
if ((s = init_sdl_video(VIDEO_MODE_X, VIDEO_MODE_Y, depth, flags)) == NULL)
return; return;
#ifdef ENABLE_VOSF #ifdef ENABLE_VOSF
the_host_buffer = (uint8 *)s->pixels; the_host_buffer = (uint8 *)s->pixels;
@ -1020,13 +1044,18 @@ void driver_base::set_video_mode(int flags)
void driver_base::init() void driver_base::init()
{ {
set_video_mode(display_type == DISPLAY_SCREEN ? SDL_WINDOW_FULLSCREEN : 0); int pitch = VIDEO_MODE_X;
switch (VIDEO_MODE_DEPTH) {
case VIDEO_DEPTH_16BIT: pitch <<= 1; break;
case VIDEO_DEPTH_32BIT: pitch <<= 2; break;
}
int aligned_height = (VIDEO_MODE_Y + 15) & ~15; 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_buffer_size = page_extend((aligned_height + 2) * s->pitch); the_buffer_size = page_extend((aligned_height + 2) * 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);
D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer)); D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
@ -1049,12 +1078,15 @@ void driver_base::init()
#endif #endif
if (!use_vosf) { if (!use_vosf) {
// Allocate memory for frame buffer // Allocate memory for frame buffer
the_buffer_size = (aligned_height + 2) * s->pitch; the_buffer_size = (aligned_height + 2) * pitch;
the_buffer_copy = (uint8 *)calloc(1, the_buffer_size); the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
memset(the_buffer, 0, the_buffer_size);
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_video_mode(display_type == DISPLAY_SCREEN ? SDL_WINDOW_FULLSCREEN : 0, pitch);
// Set frame buffer base // Set frame buffer base
set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true); set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
@ -2592,6 +2624,7 @@ static void update_display_static(driver_base *drv)
static void update_display_static_bbox(driver_base *drv) static void update_display_static_bbox(driver_base *drv)
{ {
const VIDEO_MODE &mode = drv->mode; const VIDEO_MODE &mode = drv->mode;
bool blit = (int)VIDEO_MODE_DEPTH == VIDEO_DEPTH_16BIT;
// Allocate bounding boxes for SDL_UpdateRects() // Allocate bounding boxes for SDL_UpdateRects()
const uint32 N_PIXELS = 64; const uint32 N_PIXELS = 64;
@ -2624,7 +2657,7 @@ static void update_display_static_bbox(driver_base *drv)
const uint32 dst_yb = j * dst_bytes_per_row; const uint32 dst_yb = j * dst_bytes_per_row;
if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) { if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs); memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs); if (blit) Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs);
dirty = true; dirty = true;
} }
} }

4
BasiliskII/src/Unix/configure.ac
View File

@ -28,7 +28,7 @@ dnl Video options.
AC_ARG_ENABLE(xf86-dga, [ --enable-xf86-dga use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes]) AC_ARG_ENABLE(xf86-dga, [ --enable-xf86-dga use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
AC_ARG_ENABLE(xf86-vidmode, [ --enable-xf86-vidmode use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes]) AC_ARG_ENABLE(xf86-vidmode, [ --enable-xf86-vidmode use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
AC_ARG_ENABLE(fbdev-dga, [ --enable-fbdev-dga use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes]) AC_ARG_ENABLE(fbdev-dga, [ --enable-fbdev-dga use direct frame buffer access via /dev/fb [default=yes]], [WANT_FBDEV_DGA=$enableval], [WANT_FBDEV_DGA=yes])
AC_ARG_ENABLE(vosf, [ --enable-vosf enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes]) AC_ARG_ENABLE(vosf, [ --enable-vosf enable video on SEGV signals [default=no]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
dnl SDL options. dnl SDL options.
AC_ARG_ENABLE(sdl-static, [ --enable-sdl-static use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no]) AC_ARG_ENABLE(sdl-static, [ --enable-sdl-static use SDL static libraries for linking [default=no]], [WANT_SDL_STATIC=$enableval], [WANT_SDL_STATIC=no])
@ -1417,7 +1417,6 @@ else
fi fi
dnl Real addressing will probably work. dnl Real addressing will probably work.
ADDRESSING_MODE="real" ADDRESSING_MODE="real"
WANT_VOSF=yes dnl we can use VOSF and we need it actually
DEFINES="$DEFINES -DREAL_ADDRESSING" DEFINES="$DEFINES -DREAL_ADDRESSING"
if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then if [[ "x$ac_cv_pagezero_hack" = "xyes" ]]; then
BLESS=Darwin/lowmem BLESS=Darwin/lowmem
@ -1429,7 +1428,6 @@ else
dnl Requires VOSF screen updates dnl Requires VOSF screen updates
if [[ "x$CAN_VOSF" = "xyes" ]]; then if [[ "x$CAN_VOSF" = "xyes" ]]; then
ADDRESSING_MODE="direct" ADDRESSING_MODE="direct"
WANT_VOSF=yes dnl we can use VOSF and we need it actually
DEFINES="$DEFINES -DDIRECT_ADDRESSING" DEFINES="$DEFINES -DDIRECT_ADDRESSING"
break break
fi fi

10
BasiliskII/src/Windows/configure.ac
View File

@ -35,6 +35,7 @@ AC_ARG_ENABLE(fpe,
dnl External packages. dnl External packages.
AC_ARG_WITH(gtk, [ --with-gtk use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes]) AC_ARG_WITH(gtk, [ --with-gtk use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
AC_ARG_ENABLE(vosf, [ --enable-vosf enable video on SEGV signals [default=no]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
AC_ARG_WITH(bincue, AC_ARG_WITH(bincue,
AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode])) AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
@ -211,8 +212,12 @@ AC_CACHE_CHECK([whether we can skip instruction in SIGSEGV handler],
AC_TRANSLATE_DEFINE(HAVE_SIGSEGV_SKIP_INSTRUCTION, "$ac_cv_have_skip_instruction", AC_TRANSLATE_DEFINE(HAVE_SIGSEGV_SKIP_INSTRUCTION, "$ac_cv_have_skip_instruction",
[Define if we can ignore the fault (instruction skipping in SIGSEGV handler).]) [Define if we can ignore the fault (instruction skipping in SIGSEGV handler).])
dnl We really want VOSF (Video on SEGV Signals) screen updates acceleration dnl Enable VOSF screen updates with this feature is requested
AC_DEFINE(ENABLE_VOSF, 1, [Define if using video enabled on SEGV signals.]) if [[ "x$WANT_VOSF" = "xyes" ]]; then
AC_DEFINE(ENABLE_VOSF, 1, [Define if using video enabled on SEGV signals.])
else
WANT_VOSF=no
fi
dnl Determine the addressing mode to use dnl Determine the addressing mode to use
ADDRESSING_MODE="" ADDRESSING_MODE=""
@ -587,5 +592,6 @@ echo Assembly optimizations ................. : $ASM_OPTIMIZATIONS
echo Addressing mode ........................ : $ADDRESSING_MODE echo Addressing mode ........................ : $ADDRESSING_MODE
echo BINCUE support ......................... : $have_bincue echo BINCUE support ......................... : $have_bincue
echo GTK user interface ..................... : $WANT_GTK echo GTK user interface ..................... : $WANT_GTK
echo Enable VOSF ............................ : $WANT_VOSF
echo echo
echo "Configuration done. Now type \"make\" (or \"gmake\")." echo "Configuration done. Now type \"make\" (or \"gmake\")."

4
SheepShaver/src/Windows/configure.ac
View File

@ -14,7 +14,7 @@ AC_CANONICAL_TARGET
dnl Options. dnl Options.
AC_ARG_ENABLE(jit, [ --enable-jit enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes]) AC_ARG_ENABLE(jit, [ --enable-jit enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
AC_ARG_WITH(gtk, [ --with-gtk use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes]) AC_ARG_WITH(gtk, [ --with-gtk use GTK user interface [default=yes]], [WANT_GTK=$withval], [WANT_GTK=yes])
AC_ARG_ENABLE(vosf, [ --enable-vosf enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes]) AC_ARG_ENABLE(vosf, [ --enable-vosf enable video on SEGV signals [default=no]], [WANT_VOSF=$enableval], [WANT_VOSF=no])
AC_ARG_WITH(bincue, AC_ARG_WITH(bincue,
AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode])) AS_HELP_STRING([--with-bincue], [Allow cdrom image files in bin/cue mode]))
@ -307,7 +307,7 @@ echo SheepShaver configuration summary:
echo echo
echo Enable JIT compiler .............. : $WANT_JIT echo Enable JIT compiler .............. : $WANT_JIT
echo GTK user interface ............... : $WANT_GTK echo GTK user interface ............... : $WANT_GTK
echo BINCUE support ......................... : $have_bincue echo BINCUE support ................... : $have_bincue
echo Enable VOSF ...................... : $WANT_VOSF echo Enable VOSF ...................... : $WANT_VOSF
echo echo
echo "Configuration done. Now type \"make\"." echo "Configuration done. Now type \"make\"."