From 4b80dd23a4462b0f4e9f096e0dc0cc4606d8cfe8 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Sat, 25 May 2019 17:47:13 -0300 Subject: yuzu_cmd: Split emu_window OpenGL implementation into its own file --- src/yuzu_cmd/emu_window/emu_window_sdl2.h | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'src/yuzu_cmd/emu_window/emu_window_sdl2.h') diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h index 17e98227f..09145835b 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.h +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h @@ -15,24 +15,13 @@ public: explicit EmuWindow_SDL2(bool fullscreen); ~EmuWindow_SDL2(); - /// Swap buffers to display the next frame - void SwapBuffers() override; - /// Polls window events void PollEvents() override; - /// Makes the graphics context current for the caller thread - void MakeCurrent() override; - - /// Releases the GL context from the caller thread - void DoneCurrent() override; - - std::unique_ptr CreateSharedContext() const override; - /// Whether the window is still open, and a close request hasn't yet been sent bool IsOpen() const; -private: +protected: /// Called by PollEvents when a key is pressed or released. void OnKeyEvent(int key, u8 state); @@ -60,9 +49,6 @@ private: /// Called when user passes the fullscreen parameter flag void Fullscreen(); - /// Whether the GPU and driver supports the OpenGL extension required - bool SupportsRequiredGLExtensions(); - /// Called when a configuration change affects the minimal size of the window void OnMinimalClientAreaChangeRequest( const std::pair& minimal_size) override; @@ -70,10 +56,9 @@ private: /// Is the window still open? bool is_open = true; + /// Is the window being shown? + bool is_shown = true; + /// Internal SDL2 render window SDL_Window* render_window; - - using SDL_GLContext = void*; - /// The OpenGL context associated with the window - SDL_GLContext gl_context; }; -- cgit v1.2.3 From 37eaf39b4443305fd04b894abcfc09cd68c17087 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Sat, 25 May 2019 17:50:20 -0300 Subject: emu_window: Pass OnMinimalClientAreaChangeRequest argument by copy There's no performance improvement in passing an unsigned pair by reference. --- src/yuzu_cmd/emu_window/emu_window_sdl2.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/yuzu_cmd/emu_window/emu_window_sdl2.h') diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h index 09145835b..d8051ebdf 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.h +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h @@ -50,8 +50,7 @@ protected: void Fullscreen(); /// Called when a configuration change affects the minimal size of the window - void OnMinimalClientAreaChangeRequest( - const std::pair& minimal_size) override; + void OnMinimalClientAreaChangeRequest(std::pair minimal_size) override; /// Is the window still open? bool is_open = true; -- cgit v1.2.3