Overhaul EmuWindow::PollEvents to fix yuzu-cmd calling SDL_PollEvents off main thread

EmuWindow::PollEvents was called from the GPU thread (or the CPU thread
in sync-GPU mode) when swapping buffers.  It had three implementations:

- In GRenderWindow, it didn't actually poll events, just set a flag and
  emit a signal to indicate that a frame was displayed.

- In EmuWindow_SDL2_Hide, it did nothing.

- In EmuWindow_SDL2, it did call SDL_PollEvents, but this is wrong
  because SDL_PollEvents is supposed to be called on the thread that set
  up video - in this case, the main thread, which was sleeping in a
  busyloop (regardless of whether sync-GPU was enabled).  On macOS this
  causes a crash.

To fix this:

- Rename EmuWindow::PollEvents to OnFrameDisplayed, and give it a
  default implementation that does nothing.

- In EmuWindow_SDL2, do not override OnFrameDisplayed, but instead have
  the main thread call SDL_WaitEvent in a loop.
This commit is contained in:
comex 2020-11-22 16:05:18 -05:00
parent 5d1447897a
commit 994f497781
10 changed files with 68 additions and 73 deletions

View File

@ -102,8 +102,8 @@ public:
float render_surface_scale = 1.0f; float render_surface_scale = 1.0f;
}; };
/// Polls window events /// Called from GPU thread when a frame is displayed.
virtual void PollEvents() = 0; virtual void OnFrameDisplayed() {}
/** /**
* Returns a GraphicsContext that the frontend provides to be used for rendering. * Returns a GraphicsContext that the frontend provides to be used for rendering.

View File

@ -151,8 +151,8 @@ void RendererOpenGL::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) {
rasterizer->TickFrame(); rasterizer->TickFrame();
render_window.PollEvents();
context->SwapBuffers(); context->SwapBuffers();
render_window.OnFrameDisplayed();
} }
void RendererOpenGL::PrepareRendertarget(const Tegra::FramebufferConfig* framebuffer) { void RendererOpenGL::PrepareRendertarget(const Tegra::FramebufferConfig* framebuffer) {

View File

@ -252,8 +252,6 @@ RendererVulkan::~RendererVulkan() {
} }
void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) { void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) {
render_window.PollEvents();
if (!framebuffer) { if (!framebuffer) {
return; return;
} }
@ -283,7 +281,7 @@ void RendererVulkan::SwapBuffers(const Tegra::FramebufferConfig* framebuffer) {
rasterizer->TickFrame(); rasterizer->TickFrame();
} }
render_window.PollEvents(); render_window.OnFrameDisplayed();
} }
bool RendererVulkan::Init() { bool RendererVulkan::Init() {

View File

@ -308,7 +308,7 @@ GRenderWindow::~GRenderWindow() {
input_subsystem->Shutdown(); input_subsystem->Shutdown();
} }
void GRenderWindow::PollEvents() { void GRenderWindow::OnFrameDisplayed() {
if (!first_frame) { if (!first_frame) {
first_frame = true; first_frame = true;
emit FirstFrameDisplayed(); emit FirstFrameDisplayed();

View File

@ -131,7 +131,7 @@ public:
~GRenderWindow() override; ~GRenderWindow() override;
// EmuWindow implementation. // EmuWindow implementation.
void PollEvents() override; void OnFrameDisplayed() override;
bool IsShown() const override; bool IsShown() const override;
std::unique_ptr<Core::Frontend::GraphicsContext> CreateSharedContext() const override; std::unique_ptr<Core::Frontend::GraphicsContext> CreateSharedContext() const override;

View File

@ -121,62 +121,64 @@ void EmuWindow_SDL2::Fullscreen() {
SDL_MaximizeWindow(render_window); SDL_MaximizeWindow(render_window);
} }
void EmuWindow_SDL2::PollEvents() { void EmuWindow_SDL2::WaitEvent() {
// Called on main thread
SDL_Event event; SDL_Event event;
// SDL_PollEvent returns 0 when there are no more events in the event queue if (!SDL_WaitEvent(&event)) {
while (SDL_PollEvent(&event)) { LOG_CRITICAL(Frontend, "SDL_WaitEvent failed: {}", SDL_GetError());
switch (event.type) { exit(1);
case SDL_WINDOWEVENT: }
switch (event.window.event) {
case SDL_WINDOWEVENT_SIZE_CHANGED: switch (event.type) {
case SDL_WINDOWEVENT_RESIZED: case SDL_WINDOWEVENT:
case SDL_WINDOWEVENT_MAXIMIZED: switch (event.window.event) {
case SDL_WINDOWEVENT_RESTORED: case SDL_WINDOWEVENT_SIZE_CHANGED:
OnResize(); case SDL_WINDOWEVENT_RESIZED:
break; case SDL_WINDOWEVENT_MAXIMIZED:
case SDL_WINDOWEVENT_MINIMIZED: case SDL_WINDOWEVENT_RESTORED:
case SDL_WINDOWEVENT_EXPOSED: OnResize();
is_shown = event.window.event == SDL_WINDOWEVENT_EXPOSED;
OnResize();
break;
case SDL_WINDOWEVENT_CLOSE:
is_open = false;
break;
}
break; break;
case SDL_KEYDOWN: case SDL_WINDOWEVENT_MINIMIZED:
case SDL_KEYUP: case SDL_WINDOWEVENT_EXPOSED:
OnKeyEvent(static_cast<int>(event.key.keysym.scancode), event.key.state); is_shown = event.window.event == SDL_WINDOWEVENT_EXPOSED;
OnResize();
break; break;
case SDL_MOUSEMOTION: case SDL_WINDOWEVENT_CLOSE:
// ignore if it came from touch
if (event.button.which != SDL_TOUCH_MOUSEID)
OnMouseMotion(event.motion.x, event.motion.y);
break;
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
// ignore if it came from touch
if (event.button.which != SDL_TOUCH_MOUSEID) {
OnMouseButton(event.button.button, event.button.state, event.button.x,
event.button.y);
}
break;
case SDL_FINGERDOWN:
OnFingerDown(event.tfinger.x, event.tfinger.y);
break;
case SDL_FINGERMOTION:
OnFingerMotion(event.tfinger.x, event.tfinger.y);
break;
case SDL_FINGERUP:
OnFingerUp();
break;
case SDL_QUIT:
is_open = false; is_open = false;
break; break;
default:
break;
} }
break;
case SDL_KEYDOWN:
case SDL_KEYUP:
OnKeyEvent(static_cast<int>(event.key.keysym.scancode), event.key.state);
break;
case SDL_MOUSEMOTION:
// ignore if it came from touch
if (event.button.which != SDL_TOUCH_MOUSEID)
OnMouseMotion(event.motion.x, event.motion.y);
break;
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
// ignore if it came from touch
if (event.button.which != SDL_TOUCH_MOUSEID) {
OnMouseButton(event.button.button, event.button.state, event.button.x, event.button.y);
}
break;
case SDL_FINGERDOWN:
OnFingerDown(event.tfinger.x, event.tfinger.y);
break;
case SDL_FINGERMOTION:
OnFingerMotion(event.tfinger.x, event.tfinger.y);
break;
case SDL_FINGERUP:
OnFingerUp();
break;
case SDL_QUIT:
is_open = false;
break;
default:
break;
} }
const u32 current_time = SDL_GetTicks(); const u32 current_time = SDL_GetTicks();

View File

@ -23,38 +23,38 @@ public:
explicit EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem); explicit EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem);
~EmuWindow_SDL2(); ~EmuWindow_SDL2();
/// Polls window events
void PollEvents() override;
/// Whether the window is still open, and a close request hasn't yet been sent /// Whether the window is still open, and a close request hasn't yet been sent
bool IsOpen() const; bool IsOpen() const;
/// Returns if window is shown (not minimized) /// Returns if window is shown (not minimized)
bool IsShown() const override; bool IsShown() const override;
/// Wait for the next event on the main thread.
void WaitEvent();
protected: protected:
/// Called by PollEvents when a key is pressed or released. /// Called by WaitEvent when a key is pressed or released.
void OnKeyEvent(int key, u8 state); void OnKeyEvent(int key, u8 state);
/// Called by PollEvents when the mouse moves. /// Called by WaitEvent when the mouse moves.
void OnMouseMotion(s32 x, s32 y); void OnMouseMotion(s32 x, s32 y);
/// Called by PollEvents when a mouse button is pressed or released /// Called by WaitEvent when a mouse button is pressed or released
void OnMouseButton(u32 button, u8 state, s32 x, s32 y); void OnMouseButton(u32 button, u8 state, s32 x, s32 y);
/// Translates pixel position (0..1) to pixel positions /// Translates pixel position (0..1) to pixel positions
std::pair<unsigned, unsigned> TouchToPixelPos(float touch_x, float touch_y) const; std::pair<unsigned, unsigned> TouchToPixelPos(float touch_x, float touch_y) const;
/// Called by PollEvents when a finger starts touching the touchscreen /// Called by WaitEvent when a finger starts touching the touchscreen
void OnFingerDown(float x, float y); void OnFingerDown(float x, float y);
/// Called by PollEvents when a finger moves while touching the touchscreen /// Called by WaitEvent when a finger moves while touching the touchscreen
void OnFingerMotion(float x, float y); void OnFingerMotion(float x, float y);
/// Called by PollEvents when a finger stops touching the touchscreen /// Called by WaitEvent when a finger stops touching the touchscreen
void OnFingerUp(); void OnFingerUp();
/// Called by PollEvents when any event that may cause the window to be resized occurs /// Called by WaitEvent when any event that may cause the window to be resized occurs
void OnResize(); void OnResize();
/// Called when user passes the fullscreen parameter flag /// Called when user passes the fullscreen parameter flag

View File

@ -242,7 +242,7 @@ int main(int argc, char** argv) {
system.Run(); system.Run();
while (emu_window->IsOpen()) { while (emu_window->IsOpen()) {
std::this_thread::sleep_for(std::chrono::milliseconds(1)); emu_window->WaitEvent();
} }
system.Pause(); system.Pause();
system.Shutdown(); system.Shutdown();

View File

@ -109,8 +109,6 @@ EmuWindow_SDL2_Hide::~EmuWindow_SDL2_Hide() {
SDL_Quit(); SDL_Quit();
} }
void EmuWindow_SDL2_Hide::PollEvents() {}
bool EmuWindow_SDL2_Hide::IsShown() const { bool EmuWindow_SDL2_Hide::IsShown() const {
return false; return false;
} }

View File

@ -17,9 +17,6 @@ public:
explicit EmuWindow_SDL2_Hide(); explicit EmuWindow_SDL2_Hide();
~EmuWindow_SDL2_Hide(); ~EmuWindow_SDL2_Hide();
/// Polls window events
void PollEvents() override;
/// Whether the screen is being shown or not. /// Whether the screen is being shown or not.
bool IsShown() const override; bool IsShown() const override;