Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Perf: re-enable VOSF on Xcode-made, OSX-host builds

This commit is contained in:
David Ludwig 2017-09-12 18:35:24 -04:00
parent ef26204e6d
commit 4e5e3377f1
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
View File

@ -1316,6 +1316,7 @@
"$(inherited)",
"$(LOCAL_LIBRARY_DIR)/Frameworks",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.basiliskii.BasiliskII;
@ -1332,6 +1333,7 @@
"$(inherited)",
"$(LOCAL_LIBRARY_DIR)/Frameworks",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.basiliskii.BasiliskII;

1
BasiliskII/src/MacOSX/config.h
View File

@ -43,6 +43,7 @@
/* Define if using video enabled on SEGV signals. */
/* #undef ENABLE_VOSF */
#define ENABLE_VOSF 1
/* Define if using XFree86 DGA extension. */
/* #undef ENABLE_XF86_DGA */

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

@ -210,9 +210,6 @@ extern void SysMountFirstFloppy(void);
static void *vm_acquire_framebuffer(uint32 size)
{
#if __MACOSX__
return calloc(1, size);
#else
// always try to reallocate framebuffer at the same address
static void *fb = VM_MAP_FAILED;
if (fb != VM_MAP_FAILED) {
@ -226,16 +223,11 @@ static void *vm_acquire_framebuffer(uint32 size)
if (fb == VM_MAP_FAILED)
fb = vm_acquire(size, VM_MAP_DEFAULT | VM_MAP_32BIT);
return fb;
#endif
}
static inline void vm_release_framebuffer(void *fb, uint32 size)
{
#if __MACOSX__
free(fb);
#else
vm_release(fb, size);
#endif
}
static inline int get_customized_color_depth(int default_depth)
@ -696,7 +688,7 @@ static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags
if (guest_surface) {
delete_sdl_video_surfaces();
}
int window_width = width;
int window_height = height;
Uint32 window_flags = 0;
@ -961,7 +953,7 @@ void driver_base::init()
printf("VOSF acceleration is not profitable on this platform, disabling it\n");
use_vosf = false;
}
if (!use_vosf) {
if (!use_vosf) {
free(the_buffer_copy);
vm_release(the_buffer, the_buffer_size);
the_host_buffer = NULL;