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.
This commit is contained in:
Lioncash
2018-08-01 20:59:42 -04:00
parent 99a1d7440d
commit 0f2ac928f2
13 changed files with 54 additions and 64 deletions

View File

@ -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();