diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-08-01 20:59:42 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-08-01 21:40:30 -0400 |
| commit | 0f2ac928f291101bd74aac661cff7d14dfa8c984 (patch) | |
| tree | 39d1ba26d25bd06874b58990c5deb4d1f4ed252d /src/video_core/video_core.h | |
| parent | 99a1d7440db6412f5cddcb7e00b523661f16cb53 (diff) | |
video_core: Make global EmuWindow instance part of the base renderer class
Makes the global a member of the RendererBase class. We also change this
to be a reference. Passing any form of null pointer to these functions
is incorrect entirely, especially given the code itself assumes that the
pointer would always be in a valid state.
This also makes it easier to follow the lifecycle of instances being
used, as we explicitly interact the renderer with the rasterizer, rather
than it just operating on a global pointer.
Diffstat (limited to 'src/video_core/video_core.h')
| -rw-r--r-- | src/video_core/video_core.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h index 37da62436..8707e9881 100644 --- a/src/video_core/video_core.h +++ b/src/video_core/video_core.h @@ -18,7 +18,6 @@ namespace VideoCore { enum class Renderer { Software, OpenGL }; extern std::unique_ptr<RendererBase> g_renderer; ///< Renderer plugin -extern EmuWindow* g_emu_window; ///< Emu window // TODO: Wrap these in a user settings struct along with any other graphics settings (often set from // qt ui) @@ -28,7 +27,7 @@ extern std::atomic<bool> g_toggle_framelimit_enabled; void Start(); /// Initialize the video core -bool Init(EmuWindow* emu_window); +bool Init(EmuWindow& emu_window); /// Shutdown the video core void Shutdown(); |