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

Merge pull request #12 from spolsley/mutex_test 

SDL mutex deadlock and video fix, try 2
This commit is contained in:
kanjitalk755 2019-02-27 15:09:06 +09:00 committed by GitHub
parent 1b6a63edf7 1889560d1f
commit a8bb4790df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -875,23 +875,24 @@ static int present_sdl_video()
SDL_SetRenderDrawColor(sdl_renderer, 0, 0, 0, 0); // Use black
SDL_RenderClear(sdl_renderer); // Clear the display
// We're about to work with sdl_update_video_rect, so stop other threads from
// modifying it!
LOCK_PALETTE;
SDL_LockMutex(sdl_update_video_mutex);
// Convert from the guest OS' pixel format, to the host OS' texture, if necessary.
if (host_surface != guest_surface &&
host_surface != NULL &&
guest_surface != NULL)
{
SDL_Rect destRect = sdl_update_video_rect;
LOCK_PALETTE;
SDL_LockMutex(sdl_update_video_mutex);
int result = SDL_BlitSurface(guest_surface, &sdl_update_video_rect, host_surface, &destRect);
SDL_UnlockMutex(sdl_update_video_mutex);
UNLOCK_PALETTE;
if (result != 0) return -1;
if (result != 0) {
SDL_UnlockMutex(sdl_update_video_mutex);
UNLOCK_PALETTE;
return -1;
}
}
// We're about to work with sdl_update_video_rect, so stop other threads from
// modifying it!
SDL_LockMutex(sdl_update_video_mutex);
UNLOCK_PALETTE; // passed potential deadlock, can unlock palette
// Update the host OS' texture
void * srcPixels = (void *)((uint8_t *)host_surface->pixels +