diff --git a/src/frontend-common/d3d11_host_display.h b/src/frontend-common/d3d11_host_display.h index 9d64361f4..2d2777eb3 100644 --- a/src/frontend-common/d3d11_host_display.h +++ b/src/frontend-common/d3d11_host_display.h @@ -16,7 +16,7 @@ namespace FrontendCommon { -class D3D11HostDisplay : public HostDisplay +class D3D11HostDisplay final : public HostDisplay { public: template @@ -25,31 +25,31 @@ public: D3D11HostDisplay(); ~D3D11HostDisplay(); - virtual RenderAPI GetRenderAPI() const override; - virtual void* GetRenderDevice() const override; - virtual void* GetRenderContext() const override; + RenderAPI GetRenderAPI() const override; + void* GetRenderDevice() const override; + void* GetRenderContext() const override; - virtual bool HasRenderDevice() const override; - virtual bool HasRenderSurface() const override; + bool HasRenderDevice() const override; + bool HasRenderSurface() const override; - virtual bool CreateRenderDevice(const WindowInfo& wi, std::string_view adapter_name, bool debug_device, - bool threaded_presentation) override; - virtual bool InitializeRenderDevice(std::string_view shader_cache_directory, bool debug_device, - bool threaded_presentation) override; - virtual void DestroyRenderDevice() override; + bool CreateRenderDevice(const WindowInfo& wi, std::string_view adapter_name, bool debug_device, + bool threaded_presentation) override; + bool InitializeRenderDevice(std::string_view shader_cache_directory, bool debug_device, + bool threaded_presentation) override; + void DestroyRenderDevice() override; - virtual bool MakeRenderContextCurrent() override; - virtual bool DoneRenderContextCurrent() override; + bool MakeRenderContextCurrent() override; + bool DoneRenderContextCurrent() override; - virtual bool ChangeRenderWindow(const WindowInfo& new_wi) override; - virtual void ResizeRenderWindow(s32 new_window_width, s32 new_window_height) override; - virtual bool SupportsFullscreen() const override; - virtual bool IsFullscreen() override; - virtual bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) override; - virtual AdapterAndModeList GetAdapterAndModeList() override; - virtual void DestroyRenderSurface() override; + bool ChangeRenderWindow(const WindowInfo& new_wi) override; + void ResizeRenderWindow(s32 new_window_width, s32 new_window_height) override; + bool SupportsFullscreen() const override; + bool IsFullscreen() override; + bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) override; + AdapterAndModeList GetAdapterAndModeList() override; + void DestroyRenderSurface() override; - virtual bool SetPostProcessingChain(const std::string_view& config) override; + bool SetPostProcessingChain(const std::string_view& config) override; std::unique_ptr CreateTexture(u32 width, u32 height, u32 layers, u32 levels, u32 samples, HostDisplayPixelFormat format, const void* data, u32 data_stride, @@ -65,11 +65,11 @@ public: bool GetHostRefreshRate(float* refresh_rate) override; - virtual void SetVSync(bool enabled) override; + void SetVSync(bool enabled) override; - virtual bool Render() override; - virtual bool RenderScreenshot(u32 width, u32 height, std::vector* out_pixels, u32* out_stride, - HostDisplayPixelFormat* out_format) override; + bool Render() override; + bool RenderScreenshot(u32 width, u32 height, std::vector* out_pixels, u32* out_stride, + HostDisplayPixelFormat* out_format) override; static AdapterAndModeList StaticGetAdapterAndModeList(); @@ -78,12 +78,12 @@ protected: static AdapterAndModeList GetAdapterAndModeList(IDXGIFactory* dxgi_factory); - virtual bool CreateResources() override; - virtual void DestroyResources() override; + bool CreateResources() override; + void DestroyResources() override; - virtual bool CreateImGuiContext() override; - virtual void DestroyImGuiContext() override; - virtual bool UpdateImGuiFontTexture() override; + bool CreateImGuiContext() override; + void DestroyImGuiContext() override; + bool UpdateImGuiFontTexture() override; bool CreateSwapChain(const DXGI_MODE_DESC* fullscreen_mode); bool CreateSwapChainRTV(); @@ -108,8 +108,8 @@ protected: bool CheckPostProcessingRenderTargets(u32 target_width, u32 target_height); void ApplyPostProcessingChain(ID3D11RenderTargetView* final_target, s32 final_left, s32 final_top, s32 final_width, s32 final_height, void* texture_handle, u32 texture_width, s32 texture_height, - s32 texture_view_x, s32 texture_view_y, s32 texture_view_width, - s32 texture_view_height, u32 target_width, u32 target_height); + s32 texture_view_x, s32 texture_view_y, s32 texture_view_width, s32 texture_view_height, + u32 target_width, u32 target_height); ComPtr m_device; ComPtr m_context; diff --git a/src/frontend-common/opengl_host_display.h b/src/frontend-common/opengl_host_display.h index f95e18523..23e8d7009 100644 --- a/src/frontend-common/opengl_host_display.h +++ b/src/frontend-common/opengl_host_display.h @@ -19,37 +19,37 @@ namespace FrontendCommon { -class OpenGLHostDisplay : public HostDisplay +class OpenGLHostDisplay final : public HostDisplay { public: OpenGLHostDisplay(); - virtual ~OpenGLHostDisplay(); + ~OpenGLHostDisplay(); - virtual RenderAPI GetRenderAPI() const override; - virtual void* GetRenderDevice() const override; - virtual void* GetRenderContext() const override; + RenderAPI GetRenderAPI() const override; + void* GetRenderDevice() const override; + void* GetRenderContext() const override; - virtual bool HasRenderDevice() const override; - virtual bool HasRenderSurface() const override; + bool HasRenderDevice() const override; + bool HasRenderSurface() const override; - virtual bool CreateRenderDevice(const WindowInfo& wi, std::string_view adapter_name, bool debug_device, - bool threaded_presentation) override; - virtual bool InitializeRenderDevice(std::string_view shader_cache_directory, bool debug_device, - bool threaded_presentation) override; - virtual void DestroyRenderDevice() override; + bool CreateRenderDevice(const WindowInfo& wi, std::string_view adapter_name, bool debug_device, + bool threaded_presentation) override; + bool InitializeRenderDevice(std::string_view shader_cache_directory, bool debug_device, + bool threaded_presentation) override; + void DestroyRenderDevice() override; - virtual bool MakeRenderContextCurrent() override; - virtual bool DoneRenderContextCurrent() override; + bool MakeRenderContextCurrent() override; + bool DoneRenderContextCurrent() override; - virtual bool ChangeRenderWindow(const WindowInfo& new_wi) override; - virtual void ResizeRenderWindow(s32 new_window_width, s32 new_window_height) override; - virtual bool SupportsFullscreen() const override; - virtual bool IsFullscreen() override; - virtual bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) override; - virtual AdapterAndModeList GetAdapterAndModeList() override; - virtual void DestroyRenderSurface() override; + bool ChangeRenderWindow(const WindowInfo& new_wi) override; + void ResizeRenderWindow(s32 new_window_width, s32 new_window_height) override; + bool SupportsFullscreen() const override; + bool IsFullscreen() override; + bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) override; + AdapterAndModeList GetAdapterAndModeList() override; + void DestroyRenderSurface() override; - virtual bool SetPostProcessingChain(const std::string_view& config) override; + bool SetPostProcessingChain(const std::string_view& config) override; std::unique_ptr CreateTexture(u32 width, u32 height, u32 layers, u32 levels, u32 samples, HostDisplayPixelFormat format, const void* data, u32 data_stride, @@ -64,22 +64,22 @@ public: void EndSetDisplayPixels() override; bool SetDisplayPixels(HostDisplayPixelFormat format, u32 width, u32 height, const void* buffer, u32 pitch) override; - virtual void SetVSync(bool enabled) override; + void SetVSync(bool enabled) override; - virtual bool Render() override; - virtual bool RenderScreenshot(u32 width, u32 height, std::vector* out_pixels, u32* out_stride, - HostDisplayPixelFormat* out_format) override; + bool Render() override; + bool RenderScreenshot(u32 width, u32 height, std::vector* out_pixels, u32* out_stride, + HostDisplayPixelFormat* out_format) override; protected: const char* GetGLSLVersionString() const; std::string GetGLSLVersionHeader() const; - virtual bool CreateResources() override; - virtual void DestroyResources() override; + bool CreateResources() override; + void DestroyResources() override; - virtual bool CreateImGuiContext() override; - virtual void DestroyImGuiContext() override; - virtual bool UpdateImGuiFontTexture() override; + bool CreateImGuiContext() override; + void DestroyImGuiContext() override; + bool UpdateImGuiFontTexture() override; void BindDisplayPixelsTexture(); void UpdateDisplayPixelsTextureFilter(); diff --git a/src/frontend-common/vulkan_host_display.h b/src/frontend-common/vulkan_host_display.h index c394bf05e..9edd12b11 100644 --- a/src/frontend-common/vulkan_host_display.h +++ b/src/frontend-common/vulkan_host_display.h @@ -16,37 +16,37 @@ class SwapChain; namespace FrontendCommon { -class VulkanHostDisplay : public HostDisplay +class VulkanHostDisplay final : public HostDisplay { public: VulkanHostDisplay(); - virtual ~VulkanHostDisplay(); + ~VulkanHostDisplay(); - virtual RenderAPI GetRenderAPI() const override; - virtual void* GetRenderDevice() const override; - virtual void* GetRenderContext() const override; + RenderAPI GetRenderAPI() const override; + void* GetRenderDevice() const override; + void* GetRenderContext() const override; - virtual bool HasRenderDevice() const override; - virtual bool HasRenderSurface() const override; + bool HasRenderDevice() const override; + bool HasRenderSurface() const override; - virtual bool CreateRenderDevice(const WindowInfo& wi, std::string_view adapter_name, bool debug_device, + bool CreateRenderDevice(const WindowInfo& wi, std::string_view adapter_name, bool debug_device, bool threaded_presentation) override; - virtual bool InitializeRenderDevice(std::string_view shader_cache_directory, bool debug_device, + bool InitializeRenderDevice(std::string_view shader_cache_directory, bool debug_device, bool threaded_presentation) override; - virtual void DestroyRenderDevice() override; + void DestroyRenderDevice() override; - virtual bool MakeRenderContextCurrent() override; - virtual bool DoneRenderContextCurrent() override; + bool MakeRenderContextCurrent() override; + bool DoneRenderContextCurrent() override; - virtual bool ChangeRenderWindow(const WindowInfo& new_wi) override; - virtual void ResizeRenderWindow(s32 new_window_width, s32 new_window_height) override; - virtual bool SupportsFullscreen() const override; - virtual bool IsFullscreen() override; - virtual bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) override; - virtual AdapterAndModeList GetAdapterAndModeList() override; - virtual void DestroyRenderSurface() override; + bool ChangeRenderWindow(const WindowInfo& new_wi) override; + void ResizeRenderWindow(s32 new_window_width, s32 new_window_height) override; + bool SupportsFullscreen() const override; + bool IsFullscreen() override; + bool SetFullscreen(bool fullscreen, u32 width, u32 height, float refresh_rate) override; + AdapterAndModeList GetAdapterAndModeList() override; + void DestroyRenderSurface() override; - virtual bool SetPostProcessingChain(const std::string_view& config) override; + bool SetPostProcessingChain(const std::string_view& config) override; std::unique_ptr CreateTexture(u32 width, u32 height, u32 layers, u32 levels, u32 samples, HostDisplayPixelFormat format, const void* data, u32 data_stride, @@ -61,10 +61,10 @@ public: u32* out_pitch) override; void EndSetDisplayPixels() override; - virtual void SetVSync(bool enabled) override; + void SetVSync(bool enabled) override; - virtual bool Render() override; - virtual bool RenderScreenshot(u32 width, u32 height, std::vector* out_pixels, u32* out_stride, + bool Render() override; + bool RenderScreenshot(u32 width, u32 height, std::vector* out_pixels, u32* out_stride, HostDisplayPixelFormat* out_format) override; static AdapterAndModeList StaticGetAdapterAndModeList(const WindowInfo* wi); @@ -97,14 +97,14 @@ protected: u32 target_width, u32 target_height); // Can be overridden by frontends. - virtual VkRenderPass GetRenderPassForDisplay() const; + VkRenderPass GetRenderPassForDisplay() const; - virtual bool CreateResources() override; - virtual void DestroyResources() override; + bool CreateResources() override; + void DestroyResources() override; - virtual bool CreateImGuiContext() override; - virtual void DestroyImGuiContext() override; - virtual bool UpdateImGuiFontTexture() override; + bool CreateImGuiContext() override; + void DestroyImGuiContext() override; + bool UpdateImGuiFontTexture() override; void BeginSwapChainRenderPass(VkFramebuffer framebuffer, u32 width, u32 height); void RenderDisplay();