moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-01 23:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle multiple window event flush barriers in flight at once

Browse Source 
Fixes streaming on macOS Mojave without Metal support
This commit is contained in:
Cameron Gutman 2021-01-14 19:28:21 -06:00
parent 89e9652075
commit 7172cfd889
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/streaming/session.cpp
View File

@ -380,7 +380,7 @@ Session::Session(NvComputer* computer, NvApp& app, StreamingPreferences *prefere
m_InputHandler(nullptr), m_InputHandler(nullptr),
m_InputHandlerLock(0), m_InputHandlerLock(0),
m_MouseEmulationRefCount(0), m_MouseEmulationRefCount(0),
m_FlushingWindowEvents(false), m_FlushingWindowEventsRef(0),
m_AsyncConnectionSuccess(false), m_AsyncConnectionSuccess(false),
m_PortTestResults(0), m_PortTestResults(0),
m_OpusDecoder(nullptr), m_OpusDecoder(nullptr),
@ -1113,7 +1113,7 @@ void Session::flushWindowEvents()
// Insert a barrier to discard any additional window events. // Insert a barrier to discard any additional window events.
// We don't use SDL_FlushEvent() here because it could cause // We don't use SDL_FlushEvent() here because it could cause
// important events to be lost. // important events to be lost.
m_FlushingWindowEvents = true; m_FlushingWindowEventsRef++;
// This event will cause us to set m_FlushingWindowEvents back to false. // This event will cause us to set m_FlushingWindowEvents back to false.
SDL_Event flushEvent = {}; SDL_Event flushEvent = {};
@ -1343,7 +1343,7 @@ void Session::exec(int displayOriginX, int displayOriginY)
SDL_ShowCursor(SDL_ENABLE); SDL_ShowCursor(SDL_ENABLE);
break; break;
case SDL_CODE_FLUSH_WINDOW_EVENT_BARRIER: case SDL_CODE_FLUSH_WINDOW_EVENT_BARRIER:
m_FlushingWindowEvents = false; m_FlushingWindowEventsRef--;
break; break;
default: default:
SDL_assert(false); SDL_assert(false);
@ -1401,8 +1401,13 @@ void Session::exec(int displayOriginX, int displayOriginY)
SDL_SetWindowPosition(m_Window, x, y); SDL_SetWindowPosition(m_Window, x, y);
} }
if (m_FlushingWindowEvents) { if (m_FlushingWindowEventsRef > 0) {
// Ignore window events for renderer reset if flushing // Ignore window events for renderer reset if flushing
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Dropping window event during flush: %d (%d %d)",
event.window.event,
event.window.data1,
event.window.data2);
break; break;
} }

2
app/streaming/session.h
View File

@ -152,7 +152,7 @@ private:
SdlInputHandler* m_InputHandler; SdlInputHandler* m_InputHandler;
SDL_SpinLock m_InputHandlerLock; SDL_SpinLock m_InputHandlerLock;
int m_MouseEmulationRefCount; int m_MouseEmulationRefCount;
bool m_FlushingWindowEvents; int m_FlushingWindowEventsRef;
bool m_AsyncConnectionSuccess; bool m_AsyncConnectionSuccess;
int m_PortTestResults; int m_PortTestResults;