mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[client,sdl] do not wait for SDL to complete 

when updating the window surface in sdl_end_paint do not wait for
completion of the operation. The check is done in sdl_begin_paint, so
the RDP stack can continue processing other data on queue until a
graphic operation needs to be processed.
This commit is contained in:
akallabeth 2023-02-14 14:46:22 +01:00 committed by Martin Fleisz
parent 82a0eab71f
commit f807af6f8e
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/SDL/sdl_freerdp.c
View File

@ -255,7 +255,19 @@ static BOOL sdl_begin_paint(rdpContext* context)
rdpGdi* gdi;
sdlContext* sdl = (sdlContext*)context;
WINPR_ASSERT(context);
WINPR_ASSERT(sdl);
HANDLE handles[] = { sdl->update_complete, freerdp_abort_event(context) };
const DWORD status = WaitForMultipleObjects(ARRAYSIZE(handles), handles, FALSE, INFINITE);
switch (status)
{
case WAIT_OBJECT_0:
break;
default:
return FALSE;
}
if (!ResetEvent(sdl->update_complete))
return FALSE;
gdi = context->gdi;
WINPR_ASSERT(gdi);
@ -362,20 +374,9 @@ static BOOL sdl_end_paint(rdpContext* context)
sdlContext* sdl = (sdlContext*)context;
WINPR_ASSERT(sdl);
if (!ResetEvent(sdl->update_complete))
return FALSE;
if (!sdl_push_user_event(SDL_USEREVENT_UPDATE, context))
return FALSE;
HANDLE handles[] = { sdl->update_complete, freerdp_abort_event(context) };
const DWORD status = WaitForMultipleObjects(ARRAYSIZE(handles), handles, FALSE, INFINITE);
switch (status)
{
case WAIT_OBJECT_0:
return TRUE;
default:
return FALSE;
}
return TRUE;
}
/* Create a SDL surface from the GDI buffer */
@ -1133,7 +1134,7 @@ static BOOL sdl_client_new(freerdp* instance, rdpContext* context)
sdl->initialize = CreateEventA(NULL, TRUE, FALSE, NULL);
sdl->initialized = CreateEventA(NULL, TRUE, FALSE, NULL);
sdl->update_complete = CreateEventA(NULL, TRUE, FALSE, NULL);
sdl->update_complete = CreateEventA(NULL, TRUE, TRUE, NULL);
sdl->windows_created = CreateEventA(NULL, TRUE, FALSE, NULL);
return sdl->initialize && sdl->initialized && sdl->update_complete && sdl->windows_created;
}