Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsx: Apply Clang-Tidy fix "modernize-use-override"

Browse Source
This commit is contained in:
scribam
2019-06-08 09:49:47 +02:00
committed by kd-11
parent 44265aa27d
commit f1e939936a
10 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/GL/GLFragmentProgram.h
+11 -11
View File
@@ -19,18 +19,18 @@ public:
void Task(); void Task();
protected: protected:
virtual std::string getFloatTypeName(size_t elementCount) override; std::string getFloatTypeName(size_t elementCount) override;
virtual std::string getHalfTypeName(size_t elementCount) override; std::string getHalfTypeName(size_t elementCount) override;
virtual std::string getFunction(FUNCTION) override; std::string getFunction(FUNCTION) override;
virtual std::string compareFunction(COMPARE, const std::string&, const std::string&) override; std::string compareFunction(COMPARE, const std::string&, const std::string&) override;
virtual void insertHeader(std::stringstream &OS) override; void insertHeader(std::stringstream &OS) override;
virtual void insertInputs(std::stringstream &OS) override; void insertInputs(std::stringstream &OS) override;
virtual void insertOutputs(std::stringstream &OS) override; void insertOutputs(std::stringstream &OS) override;
virtual void insertConstants(std::stringstream &OS) override; void insertConstants(std::stringstream &OS) override;
virtual void insertGlobalFunctions(std::stringstream &OS) override; void insertGlobalFunctions(std::stringstream &OS) override;
virtual void insertMainStart(std::stringstream &OS) override; void insertMainStart(std::stringstream &OS) override;
virtual void insertMainEnd(std::stringstream &OS) override; void insertMainEnd(std::stringstream &OS) override;
}; };
/** Storage for an Fragment Program in the process of of recompilation. /** Storage for an Fragment Program in the process of of recompilation.
rpcs3/Emu/RSX/GL/GLGSRender.h
+1 -1
View File
@@ -351,7 +351,7 @@ private:
std::vector<u8> m_scratch_buffer; std::vector<u8> m_scratch_buffer;
public: public:
u64 get_cycles() override final; u64 get_cycles() final;
GLGSRender(); GLGSRender();
private: private:
rpcs3/Emu/RSX/GL/GLVertexProgram.h
+9 -9
View File
@@ -17,17 +17,17 @@ struct GLVertexDecompilerThread : public VertexProgramDecompiler
{ {
std::string &m_shader; std::string &m_shader;
protected: protected:
virtual std::string getFloatTypeName(size_t elementCount) override; std::string getFloatTypeName(size_t elementCount) override;
std::string getIntTypeName(size_t elementCount) override; std::string getIntTypeName(size_t elementCount) override;
virtual std::string getFunction(FUNCTION) override; std::string getFunction(FUNCTION) override;
virtual std::string compareFunction(COMPARE, const std::string&, const std::string&, bool scalar) override; std::string compareFunction(COMPARE, const std::string&, const std::string&, bool scalar) override;
virtual void insertHeader(std::stringstream &OS) override; void insertHeader(std::stringstream &OS) override;
virtual void insertInputs(std::stringstream &OS, const std::vector<ParamType> &inputs) override; void insertInputs(std::stringstream &OS, const std::vector<ParamType> &inputs) override;
virtual void insertConstants(std::stringstream &OS, const std::vector<ParamType> &constants) override; void insertConstants(std::stringstream &OS, const std::vector<ParamType> &constants) override;
virtual void insertOutputs(std::stringstream &OS, const std::vector<ParamType> &outputs) override; void insertOutputs(std::stringstream &OS, const std::vector<ParamType> &outputs) override;
virtual void insertMainStart(std::stringstream &OS) override; void insertMainStart(std::stringstream &OS) override;
virtual void insertMainEnd(std::stringstream &OS) override; void insertMainEnd(std::stringstream &OS) override;
const RSXVertexProgram &rsx_vertex_program; const RSXVertexProgram &rsx_vertex_program;
std::unordered_map<std::string, int> input_locations; std::unordered_map<std::string, int> input_locations;
rpcs3/Emu/RSX/GSRender.h
+1 -1
View File
@@ -94,7 +94,7 @@ protected:
public: public:
GSRender(); GSRender();
virtual ~GSRender(); ~GSRender() override;
void on_init_rsx() override; void on_init_rsx() override;
void on_init_thread() override; void on_init_thread() override;
rpcs3/Emu/RSX/Null/NullGSRender.h
+2 -2
View File
@@ -4,10 +4,10 @@
class NullGSRender : public GSRender class NullGSRender : public GSRender
{ {
public: public:
u64 get_cycles() override final; u64 get_cycles() final;
NullGSRender(); NullGSRender();
private: private:
bool do_method(u32 cmd, u32 value) override final; bool do_method(u32 cmd, u32 value) final;
void end() override; void end() override;
}; };
rpcs3/Emu/RSX/Overlays/overlays.h
+4 -4
View File
@@ -81,8 +81,8 @@ namespace rsx
s32 return_code = CELL_OK; s32 return_code = CELL_OK;
std::function<void(s32 status)> on_close; std::function<void(s32 status)> on_close;
virtual void update() override {} void update() override {}
virtual compiled_resource get_compiled() override = 0; compiled_resource get_compiled() override = 0;
virtual void on_button_pressed(pad_button /*button_press*/) virtual void on_button_pressed(pad_button /*button_press*/)
{ {
@@ -461,7 +461,7 @@ namespace rsx
u32 char_limit = UINT32_MAX; u32 char_limit = UINT32_MAX;
osk_dialog() = default; 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 Create(const std::string& title, const std::u16string& message, char16_t* init_text, u32 charlimit, u32 options) override = 0;
void Close(bool ok) override; void Close(bool ok) override;
@@ -484,7 +484,7 @@ namespace rsx
{ {
using osk_dialog::osk_dialog; 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 struct save_dialog : public user_interface
rpcs3/Emu/RSX/VK/VKFragmentProgram.h
+11 -11
View File
@@ -23,18 +23,18 @@ public:
void Task(); void Task();
const std::vector<vk::glsl::program_input>& get_inputs() { return inputs; } const std::vector<vk::glsl::program_input>& get_inputs() { return inputs; }
protected: protected:
virtual std::string getFloatTypeName(size_t elementCount) override; std::string getFloatTypeName(size_t elementCount) override;
virtual std::string getHalfTypeName(size_t elementCount) override; std::string getHalfTypeName(size_t elementCount) override;
virtual std::string getFunction(FUNCTION) override; std::string getFunction(FUNCTION) override;
virtual std::string compareFunction(COMPARE, const std::string&, const std::string&) override; std::string compareFunction(COMPARE, const std::string&, const std::string&) override;
virtual void insertHeader(std::stringstream &OS) override; void insertHeader(std::stringstream &OS) override;
virtual void insertInputs(std::stringstream &OS) override; void insertInputs(std::stringstream &OS) override;
virtual void insertOutputs(std::stringstream &OS) override; void insertOutputs(std::stringstream &OS) override;
virtual void insertConstants(std::stringstream &OS) override; void insertConstants(std::stringstream &OS) override;
virtual void insertGlobalFunctions(std::stringstream &OS) override; void insertGlobalFunctions(std::stringstream &OS) override;
virtual void insertMainStart(std::stringstream &OS) override; void insertMainStart(std::stringstream &OS) override;
virtual void insertMainEnd(std::stringstream &OS) override; void insertMainEnd(std::stringstream &OS) override;
}; };
/** Storage for an Fragment Program in the process of of recompilation. /** Storage for an Fragment Program in the process of of recompilation.
rpcs3/Emu/RSX/VK/VKGSRender.h
+2 -2
View File
@@ -474,9 +474,9 @@ private:
#endif #endif
public: public:
u64 get_cycles() override final; u64 get_cycles() final;
VKGSRender(); VKGSRender();
~VKGSRender(); ~VKGSRender() override;
private: private:
void clear_surface(u32 mask); void clear_surface(u32 mask);
rpcs3/Emu/RSX/VK/VKHelpers.h
+5 -5
View File
@@ -247,7 +247,7 @@ namespace vk
vmaCreateAllocator(&allocatorInfo, &m_allocator); vmaCreateAllocator(&allocatorInfo, &m_allocator);
} }
~mem_allocator_vma() = default; ~mem_allocator_vma() override = default;
void destroy() override void destroy() override
{ {
@@ -315,7 +315,7 @@ namespace vk
{ {
public: public:
mem_allocator_vk(VkDevice dev, VkPhysicalDevice pdev) : mem_allocator_base(dev, pdev) {} mem_allocator_vk(VkDevice dev, VkPhysicalDevice pdev) : mem_allocator_base(dev, pdev) {}
~mem_allocator_vk() = default; ~mem_allocator_vk() override = default;
void destroy() override {} void destroy() override {}
@@ -1693,7 +1693,7 @@ public:
: swapchain_base(gpu, _present_queue, _graphics_queue, format) : swapchain_base(gpu, _present_queue, _graphics_queue, format)
{} {}
~abstract_swapchain_impl() = default; ~abstract_swapchain_impl() override = default;
u32 get_swap_image_count() const override u32 get_swap_image_count() const override
{ {
@@ -1848,7 +1848,7 @@ public:
: native_swapchain_base(gpu, _present_queue, _graphics_queue, format) : native_swapchain_base(gpu, _present_queue, _graphics_queue, format)
{} {}
~swapchain_X11() = default; ~swapchain_X11() override = default;
bool init() override bool init() override
{ {
@@ -2041,7 +2041,7 @@ public:
} }
} }
~swapchain_WSI() = default; ~swapchain_WSI() override = default;
void create(display_handle_t&) override void create(display_handle_t&) override
{} {}
rpcs3/Emu/RSX/VK/VKVertexProgram.h
+9 -9
View File
@@ -11,17 +11,17 @@ struct VKVertexDecompilerThread : public VertexProgramDecompiler
std::vector<vk::glsl::program_input> inputs; std::vector<vk::glsl::program_input> inputs;
class VKVertexProgram *vk_prog; class VKVertexProgram *vk_prog;
protected: protected:
virtual std::string getFloatTypeName(size_t elementCount) override; std::string getFloatTypeName(size_t elementCount) override;
std::string getIntTypeName(size_t elementCount) override; std::string getIntTypeName(size_t elementCount) override;
virtual std::string getFunction(FUNCTION) override; std::string getFunction(FUNCTION) override;
virtual std::string compareFunction(COMPARE, const std::string&, const std::string&, bool scalar) override; std::string compareFunction(COMPARE, const std::string&, const std::string&, bool scalar) override;
virtual void insertHeader(std::stringstream &OS) override; void insertHeader(std::stringstream &OS) override;
virtual void insertInputs(std::stringstream &OS, const std::vector<ParamType> &inputs) override; void insertInputs(std::stringstream &OS, const std::vector<ParamType> &inputs) override;
virtual void insertConstants(std::stringstream &OS, const std::vector<ParamType> &constants) override; void insertConstants(std::stringstream &OS, const std::vector<ParamType> &constants) override;
virtual void insertOutputs(std::stringstream &OS, const std::vector<ParamType> &outputs) override; void insertOutputs(std::stringstream &OS, const std::vector<ParamType> &outputs) override;
virtual void insertMainStart(std::stringstream &OS) override; void insertMainStart(std::stringstream &OS) override;
virtual void insertMainEnd(std::stringstream &OS) override; void insertMainEnd(std::stringstream &OS) override;
const RSXVertexProgram &rsx_vertex_program; const RSXVertexProgram &rsx_vertex_program;
public: public: