mirror of
https://github.com/yuzu-emu/yuzu-android
synced 2025-01-12 21:51:55 -08:00
994f497781
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.
38 lines
945 B
C++
38 lines
945 B
C++
// Copyright 2019 yuzu Emulator Project
|
|
// Licensed under GPLv2 or any later version
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include "core/frontend/emu_window.h"
|
|
|
|
struct SDL_Window;
|
|
|
|
namespace InputCommon {
|
|
class InputSubsystem;
|
|
}
|
|
|
|
class EmuWindow_SDL2_Hide : public Core::Frontend::EmuWindow {
|
|
public:
|
|
explicit EmuWindow_SDL2_Hide();
|
|
~EmuWindow_SDL2_Hide();
|
|
|
|
/// Whether the screen is being shown or not.
|
|
bool IsShown() const override;
|
|
|
|
std::unique_ptr<Core::Frontend::GraphicsContext> CreateSharedContext() const override;
|
|
|
|
private:
|
|
/// Whether the GPU and driver supports the OpenGL extension required
|
|
bool SupportsRequiredGLExtensions();
|
|
|
|
std::unique_ptr<InputCommon::InputSubsystem> input_subsystem;
|
|
|
|
/// Internal SDL2 render window
|
|
SDL_Window* render_window;
|
|
|
|
using SDL_GLContext = void*;
|
|
/// The OpenGL context associated with the window
|
|
SDL_GLContext gl_context;
|
|
};
|