diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2020-11-25 20:44:53 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 20:44:53 -0300 |
| commit | 0e15c68f54ae5217e6247603b9e31757515f89e1 (patch) | |
| tree | 5547698f9917260b0172298b9c2219a399063987 /src/yuzu_tester/emu_window | |
| parent | b834c21894ca905cacce2bda04cf24e81175f434 (diff) | |
| parent | 994f4977810749c0b597e7a7531a02d907967a68 (diff) | |
Merge pull request #4976 from comex/poll-events
Overhaul EmuWindow::PollEvents to fix yuzu-cmd calling SDL_PollEvents off main thread
Diffstat (limited to 'src/yuzu_tester/emu_window')
| -rw-r--r-- | src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_tester/emu_window/emu_window_sdl2_hide.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp b/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp index 78f75fb38..358e03870 100644 --- a/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp +++ b/src/yuzu_tester/emu_window/emu_window_sdl2_hide.cpp @@ -109,8 +109,6 @@ EmuWindow_SDL2_Hide::~EmuWindow_SDL2_Hide() { SDL_Quit(); } -void EmuWindow_SDL2_Hide::PollEvents() {} - bool EmuWindow_SDL2_Hide::IsShown() const { return false; } diff --git a/src/yuzu_tester/emu_window/emu_window_sdl2_hide.h b/src/yuzu_tester/emu_window/emu_window_sdl2_hide.h index a553b4b95..adccdf35e 100644 --- a/src/yuzu_tester/emu_window/emu_window_sdl2_hide.h +++ b/src/yuzu_tester/emu_window/emu_window_sdl2_hide.h @@ -17,9 +17,6 @@ public: explicit EmuWindow_SDL2_Hide(); ~EmuWindow_SDL2_Hide(); - /// Polls window events - void PollEvents() override; - /// Whether the screen is being shown or not. bool IsShown() const override; |