diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-03 00:31:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 00:31:32 -0400 |
| commit | 00ba704a7fe55460e606075ce280e8933a80e973 (patch) | |
| tree | 773d3cd59cffd5682f9625e354f68f734be77351 /src/video_core/video_core.cpp | |
| parent | 4c3c608d59b8c8d8a9bbccc1b55efcab346e650f (diff) | |
| parent | 0f2ac928f291101bd74aac661cff7d14dfa8c984 (diff) | |
Merge pull request #892 from lioncash/global
video_core: Make global EmuWindow instance part of the base renderer …
Diffstat (limited to 'src/video_core/video_core.cpp')
| -rw-r--r-- | src/video_core/video_core.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index 289140f31..06b13e681 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -13,16 +13,13 @@ namespace VideoCore { -EmuWindow* g_emu_window = nullptr; ///< Frontend emulator window std::unique_ptr<RendererBase> g_renderer; ///< Renderer plugin std::atomic<bool> g_toggle_framelimit_enabled; /// Initialize the video core -bool Init(EmuWindow* emu_window) { - g_emu_window = emu_window; - g_renderer = std::make_unique<RendererOpenGL>(); - g_renderer->SetWindow(g_emu_window); +bool Init(EmuWindow& emu_window) { + g_renderer = std::make_unique<RendererOpenGL>(emu_window); if (g_renderer->Init()) { LOG_DEBUG(Render, "initialized OK"); } else { |