From f1e939936a345baa121897a07391c2fdf22b8937 Mon Sep 17 00:00:00 2001 From: scribam Date: Sat, 8 Jun 2019 09:49:47 +0200 Subject: [PATCH] rsx: Apply Clang-Tidy fix "modernize-use-override" --- rpcs3/Emu/RSX/GL/GLFragmentProgram.h | 22 +++++++++++----------- rpcs3/Emu/RSX/GL/GLGSRender.h | 2 +- rpcs3/Emu/RSX/GL/GLVertexProgram.h | 18 +++++++++--------- rpcs3/Emu/RSX/GSRender.h | 2 +- rpcs3/Emu/RSX/Null/NullGSRender.h | 4 ++-- rpcs3/Emu/RSX/Overlays/overlays.h | 8 ++++---- rpcs3/Emu/RSX/VK/VKFragmentProgram.h | 22 +++++++++++----------- rpcs3/Emu/RSX/VK/VKGSRender.h | 4 ++-- rpcs3/Emu/RSX/VK/VKHelpers.h | 10 +++++----- rpcs3/Emu/RSX/VK/VKVertexProgram.h | 18 +++++++++--------- 10 files changed, 55 insertions(+), 55 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h index 73ecfb193f..c62de5c325 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h @@ -19,18 +19,18 @@ public: void Task(); protected: - virtual std::string getFloatTypeName(size_t elementCount) override; - virtual std::string getHalfTypeName(size_t elementCount) override; - virtual std::string getFunction(FUNCTION) override; - virtual std::string compareFunction(COMPARE, const std::string&, const std::string&) override; + std::string getFloatTypeName(size_t elementCount) override; + std::string getHalfTypeName(size_t elementCount) override; + std::string getFunction(FUNCTION) override; + std::string compareFunction(COMPARE, const std::string&, const std::string&) override; - virtual void insertHeader(std::stringstream &OS) override; - virtual void insertInputs(std::stringstream &OS) override; - virtual void insertOutputs(std::stringstream &OS) override; - virtual void insertConstants(std::stringstream &OS) override; - virtual void insertGlobalFunctions(std::stringstream &OS) override; - virtual void insertMainStart(std::stringstream &OS) override; - virtual void insertMainEnd(std::stringstream &OS) override; + void insertHeader(std::stringstream &OS) override; + void insertInputs(std::stringstream &OS) override; + void insertOutputs(std::stringstream &OS) override; + void insertConstants(std::stringstream &OS) override; + void insertGlobalFunctions(std::stringstream &OS) override; + void insertMainStart(std::stringstream &OS) override; + void insertMainEnd(std::stringstream &OS) override; }; /** Storage for an Fragment Program in the process of of recompilation. diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h index a27d080cbd..c9ca8e0428 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.h +++ b/rpcs3/Emu/RSX/GL/GLGSRender.h @@ -351,7 +351,7 @@ private: std::vector m_scratch_buffer; public: - u64 get_cycles() override final; + u64 get_cycles() final; GLGSRender(); private: diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.h b/rpcs3/Emu/RSX/GL/GLVertexProgram.h index f883be01ba..d510e5e1b9 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.h +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.h @@ -17,17 +17,17 @@ struct GLVertexDecompilerThread : public VertexProgramDecompiler { std::string &m_shader; protected: - virtual std::string getFloatTypeName(size_t elementCount) override; + std::string getFloatTypeName(size_t elementCount) override; std::string getIntTypeName(size_t elementCount) override; - virtual std::string getFunction(FUNCTION) override; - virtual std::string compareFunction(COMPARE, const std::string&, const std::string&, bool scalar) override; + std::string getFunction(FUNCTION) override; + std::string compareFunction(COMPARE, const std::string&, const std::string&, bool scalar) override; - virtual void insertHeader(std::stringstream &OS) override; - virtual void insertInputs(std::stringstream &OS, const std::vector &inputs) override; - virtual void insertConstants(std::stringstream &OS, const std::vector &constants) override; - virtual void insertOutputs(std::stringstream &OS, const std::vector &outputs) override; - virtual void insertMainStart(std::stringstream &OS) override; - virtual void insertMainEnd(std::stringstream &OS) override; + void insertHeader(std::stringstream &OS) override; + void insertInputs(std::stringstream &OS, const std::vector &inputs) override; + void insertConstants(std::stringstream &OS, const std::vector &constants) override; + void insertOutputs(std::stringstream &OS, const std::vector &outputs) override; + void insertMainStart(std::stringstream &OS) override; + void insertMainEnd(std::stringstream &OS) override; const RSXVertexProgram &rsx_vertex_program; std::unordered_map input_locations; diff --git a/rpcs3/Emu/RSX/GSRender.h b/rpcs3/Emu/RSX/GSRender.h index 6688d2f338..f83528e903 100644 --- a/rpcs3/Emu/RSX/GSRender.h +++ b/rpcs3/Emu/RSX/GSRender.h @@ -94,7 +94,7 @@ protected: public: GSRender(); - virtual ~GSRender(); + ~GSRender() override; void on_init_rsx() override; void on_init_thread() override; diff --git a/rpcs3/Emu/RSX/Null/NullGSRender.h b/rpcs3/Emu/RSX/Null/NullGSRender.h index 07753a0475..a22b4516d9 100644 --- a/rpcs3/Emu/RSX/Null/NullGSRender.h +++ b/rpcs3/Emu/RSX/Null/NullGSRender.h @@ -4,10 +4,10 @@ class NullGSRender : public GSRender { public: - u64 get_cycles() override final; + u64 get_cycles() final; NullGSRender(); private: - bool do_method(u32 cmd, u32 value) override final; + bool do_method(u32 cmd, u32 value) final; void end() override; }; diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h index 1e0c4acbbb..486e3d6e93 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.h +++ b/rpcs3/Emu/RSX/Overlays/overlays.h @@ -81,8 +81,8 @@ namespace rsx s32 return_code = CELL_OK; std::function on_close; - virtual void update() override {} - virtual compiled_resource get_compiled() override = 0; + void update() override {} + compiled_resource get_compiled() override = 0; virtual void on_button_pressed(pad_button /*button_press*/) { @@ -461,7 +461,7 @@ namespace rsx u32 char_limit = UINT32_MAX; osk_dialog() = default; - virtual ~osk_dialog() = default; + ~osk_dialog() override = default; void Create(const std::string& title, const std::u16string& message, char16_t* init_text, u32 charlimit, u32 options) override = 0; void Close(bool ok) override; @@ -484,7 +484,7 @@ namespace rsx { using osk_dialog::osk_dialog; - void Create(const std::string& title, const std::u16string& message, char16_t* init_text, u32 charlimit, u32 options); + void Create(const std::string& title, const std::u16string& message, char16_t* init_text, u32 charlimit, u32 options) override; }; struct save_dialog : public user_interface diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h index d63d74fb3e..3239fac53c 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h @@ -23,18 +23,18 @@ public: void Task(); const std::vector& get_inputs() { return inputs; } protected: - virtual std::string getFloatTypeName(size_t elementCount) override; - virtual std::string getHalfTypeName(size_t elementCount) override; - virtual std::string getFunction(FUNCTION) override; - virtual std::string compareFunction(COMPARE, const std::string&, const std::string&) override; + std::string getFloatTypeName(size_t elementCount) override; + std::string getHalfTypeName(size_t elementCount) override; + std::string getFunction(FUNCTION) override; + std::string compareFunction(COMPARE, const std::string&, const std::string&) override; - virtual void insertHeader(std::stringstream &OS) override; - virtual void insertInputs(std::stringstream &OS) override; - virtual void insertOutputs(std::stringstream &OS) override; - virtual void insertConstants(std::stringstream &OS) override; - virtual void insertGlobalFunctions(std::stringstream &OS) override; - virtual void insertMainStart(std::stringstream &OS) override; - virtual void insertMainEnd(std::stringstream &OS) override; + void insertHeader(std::stringstream &OS) override; + void insertInputs(std::stringstream &OS) override; + void insertOutputs(std::stringstream &OS) override; + void insertConstants(std::stringstream &OS) override; + void insertGlobalFunctions(std::stringstream &OS) override; + void insertMainStart(std::stringstream &OS) override; + void insertMainEnd(std::stringstream &OS) override; }; /** Storage for an Fragment Program in the process of of recompilation. diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index b866a6fe24..253691f44b 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -474,9 +474,9 @@ private: #endif public: - u64 get_cycles() override final; + u64 get_cycles() final; VKGSRender(); - ~VKGSRender(); + ~VKGSRender() override; private: void clear_surface(u32 mask); diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 69536b7a3a..4792f15251 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -247,7 +247,7 @@ namespace vk vmaCreateAllocator(&allocatorInfo, &m_allocator); } - ~mem_allocator_vma() = default; + ~mem_allocator_vma() override = default; void destroy() override { @@ -315,7 +315,7 @@ namespace vk { public: mem_allocator_vk(VkDevice dev, VkPhysicalDevice pdev) : mem_allocator_base(dev, pdev) {} - ~mem_allocator_vk() = default; + ~mem_allocator_vk() override = default; void destroy() override {} @@ -1693,7 +1693,7 @@ public: : swapchain_base(gpu, _present_queue, _graphics_queue, format) {} - ~abstract_swapchain_impl() = default; + ~abstract_swapchain_impl() override = default; u32 get_swap_image_count() const override { @@ -1848,7 +1848,7 @@ public: : native_swapchain_base(gpu, _present_queue, _graphics_queue, format) {} - ~swapchain_X11() = default; + ~swapchain_X11() override = default; bool init() override { @@ -2041,7 +2041,7 @@ public: } } - ~swapchain_WSI() = default; + ~swapchain_WSI() override = default; void create(display_handle_t&) override {} diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.h b/rpcs3/Emu/RSX/VK/VKVertexProgram.h index 3c21b0ab24..33be96ed76 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexProgram.h +++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.h @@ -11,17 +11,17 @@ struct VKVertexDecompilerThread : public VertexProgramDecompiler std::vector inputs; class VKVertexProgram *vk_prog; protected: - virtual std::string getFloatTypeName(size_t elementCount) override; + std::string getFloatTypeName(size_t elementCount) override; std::string getIntTypeName(size_t elementCount) override; - virtual std::string getFunction(FUNCTION) override; - virtual std::string compareFunction(COMPARE, const std::string&, const std::string&, bool scalar) override; + std::string getFunction(FUNCTION) override; + std::string compareFunction(COMPARE, const std::string&, const std::string&, bool scalar) override; - virtual void insertHeader(std::stringstream &OS) override; - virtual void insertInputs(std::stringstream &OS, const std::vector &inputs) override; - virtual void insertConstants(std::stringstream &OS, const std::vector &constants) override; - virtual void insertOutputs(std::stringstream &OS, const std::vector &outputs) override; - virtual void insertMainStart(std::stringstream &OS) override; - virtual void insertMainEnd(std::stringstream &OS) override; + void insertHeader(std::stringstream &OS) override; + void insertInputs(std::stringstream &OS, const std::vector &inputs) override; + void insertConstants(std::stringstream &OS, const std::vector &constants) override; + void insertOutputs(std::stringstream &OS, const std::vector &outputs) override; + void insertMainStart(std::stringstream &OS) override; + void insertMainEnd(std::stringstream &OS) override; const RSXVertexProgram &rsx_vertex_program; public: