diff --git a/Core/MIPS/ARM/ArmJit.h b/Core/MIPS/ARM/ArmJit.h index 7d5a91240c..3f55e87a66 100644 --- a/Core/MIPS/ARM/ArmJit.h +++ b/Core/MIPS/ARM/ArmJit.h @@ -166,7 +166,7 @@ public: void CompNEON_ColorConv(MIPSOpcode op); void CompNEON_Vbfy(MIPSOpcode op); - int Replace_fabsf(); + int Replace_fabsf() override; JitBlockCache *GetBlockCache() override { return &blocks; } diff --git a/Core/MIPS/ARM64/Arm64Jit.h b/Core/MIPS/ARM64/Arm64Jit.h index d7b6956ffe..b4491e5384 100644 --- a/Core/MIPS/ARM64/Arm64Jit.h +++ b/Core/MIPS/ARM64/Arm64Jit.h @@ -167,18 +167,18 @@ public: void CompNEON_ColorConv(MIPSOpcode op); void CompNEON_Vbfy(MIPSOpcode op); - int Replace_fabsf(); + int Replace_fabsf() override; - JitBlockCache *GetBlockCache() { return &blocks; } + JitBlockCache *GetBlockCache() override { return &blocks; } std::vector SaveAndClearEmuHackOps() override { return blocks.SaveAndClearEmuHackOps(); } void RestoreSavedEmuHackOps(std::vector saved) override { blocks.RestoreSavedEmuHackOps(saved); } - void ClearCache(); - void InvalidateCache(); - void InvalidateCacheAt(u32 em_address, int length = 4); + void ClearCache() override; + void InvalidateCache() override; + void InvalidateCacheAt(u32 em_address, int length = 4) override; - void EatPrefix() { js.EatPrefix(); } + void EatPrefix() override { js.EatPrefix(); } const u8 *GetDispatcher() const override { return dispatcher; diff --git a/Core/MIPS/IR/IRFrontend.h b/Core/MIPS/IR/IRFrontend.h index 8ffdf5c904..80ca3a40c3 100644 --- a/Core/MIPS/IR/IRFrontend.h +++ b/Core/MIPS/IR/IRFrontend.h @@ -84,7 +84,7 @@ public: void Comp_ColorConv(MIPSOpcode op) override; void Comp_Vbfy(MIPSOpcode op) override; - int Replace_fabsf(); + int Replace_fabsf() override; void DoState(PointerWrap &p); bool CheckRounding(); // returns true if we need a do-over diff --git a/Core/MIPS/IR/IRJit.h b/Core/MIPS/IR/IRJit.h index ee95199935..3b1a840e71 100644 --- a/Core/MIPS/IR/IRJit.h +++ b/Core/MIPS/IR/IRJit.h @@ -161,9 +161,9 @@ public: std::vector SaveAndClearEmuHackOps() override { return blocks_.SaveAndClearEmuHackOps(); } void RestoreSavedEmuHackOps(std::vector saved) override { blocks_.RestoreSavedEmuHackOps(saved); } - void ClearCache(); - void InvalidateCache(); - void InvalidateCacheAt(u32 em_address, int length = 4); + void ClearCache() override; + void InvalidateCache() override; + void InvalidateCacheAt(u32 em_address, int length = 4) override; const u8 *GetDispatcher() const override { return nullptr; } diff --git a/Core/MIPS/MIPS/MipsJit.h b/Core/MIPS/MIPS/MipsJit.h index c9a11e2835..3afea13852 100644 --- a/Core/MIPS/MIPS/MipsJit.h +++ b/Core/MIPS/MIPS/MipsJit.h @@ -125,20 +125,20 @@ public: void Comp_Vsgn(MIPSOpcode op) override {} void Comp_Vocp(MIPSOpcode op) override {} void Comp_ColorConv(MIPSOpcode op) override {} - int Replace_fabsf() { return 0; } + int Replace_fabsf() override { return 0; } void Comp_Vbfy(MIPSOpcode op) {} - JitBlockCache *GetBlockCache() { return &blocks; } + JitBlockCache *GetBlockCache() override { return &blocks; } std::vector SaveAndClearEmuHackOps() override { return blocks.SaveAndClearEmuHackOps(); } void RestoreSavedEmuHackOps(std::vector saved) override { blocks.RestoreSavedEmuHackOps(saved); } - void ClearCache(); - void InvalidateCache(); - void InvalidateCacheAt(u32 em_address, int length = 4); + void ClearCache() override; + void InvalidateCache() override; + void InvalidateCacheAt(u32 em_address, int length = 4) override; - void EatPrefix() { js.EatPrefix(); } + void EatPrefix() override { js.EatPrefix(); } private: void GenerateFixedCode(); diff --git a/Core/MIPS/x86/Jit.h b/Core/MIPS/x86/Jit.h index 1326555c7c..e478e146dd 100644 --- a/Core/MIPS/x86/Jit.h +++ b/Core/MIPS/x86/Jit.h @@ -154,21 +154,21 @@ public: ApplyPrefixST(regs, js.prefixT, sz); } void GetVectorRegsPrefixD(u8 *regs, VectorSize sz, int vectorReg); - void EatPrefix() { js.EatPrefix(); } + void EatPrefix() override { js.EatPrefix(); } void RestoreRoundingMode(bool force = false); void ApplyRoundingMode(bool force = false); void UpdateRoundingMode(); - JitBlockCache *GetBlockCache() { return &blocks; } + JitBlockCache *GetBlockCache() override { return &blocks; } MIPSOpcode GetOriginalOp(MIPSOpcode op) override; std::vector SaveAndClearEmuHackOps() override { return blocks.SaveAndClearEmuHackOps(); } void RestoreSavedEmuHackOps(std::vector saved) override { blocks.RestoreSavedEmuHackOps(saved); } - void ClearCache(); + void ClearCache() override; void InvalidateCache() override; - void InvalidateCacheAt(u32 em_address, int length = 4) { + void InvalidateCacheAt(u32 em_address, int length = 4) override { if (blocks.RangeMayHaveEmuHacks(em_address, em_address + length)) { blocks.InvalidateICache(em_address, length); } diff --git a/GPU/Directx9/FramebufferDX9.h b/GPU/Directx9/FramebufferDX9.h index 3c8eec8aee..e2e24bff47 100644 --- a/GPU/Directx9/FramebufferDX9.h +++ b/GPU/Directx9/FramebufferDX9.h @@ -93,19 +93,19 @@ public: LPDIRECT3DSURFACE9 GetOffscreenSurface(LPDIRECT3DSURFACE9 similarSurface, VirtualFramebuffer *vfb); protected: - virtual void DisableState() override; - virtual void ClearBuffer(bool keepState = false) override; - virtual void FlushBeforeCopy() override; - virtual void DecimateFBOs() override; + void DisableState() override; + void ClearBuffer(bool keepState = false) override; + void FlushBeforeCopy() override; + void DecimateFBOs() override; // Used by ReadFramebufferToMemory and later framebuffer block copies - virtual void BlitFramebuffer(VirtualFramebuffer *dst, int dstX, int dstY, VirtualFramebuffer *src, int srcX, int srcY, int w, int h, int bpp) override; + void BlitFramebuffer(VirtualFramebuffer *dst, int dstX, int dstY, VirtualFramebuffer *src, int srcX, int srcY, int w, int h, int bpp) override; - virtual void NotifyRenderFramebufferCreated(VirtualFramebuffer *vfb) override; - virtual void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override; - virtual void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override; - virtual bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; - virtual void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; + void NotifyRenderFramebufferCreated(VirtualFramebuffer *vfb) override; + void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override; + void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override; + bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; + void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; private: void MakePixelTexture(const u8 *srcPixels, GEBufferFormat srcPixelFormat, int srcStride, int width, int height); diff --git a/GPU/Directx9/GPU_DX9.h b/GPU/Directx9/GPU_DX9.h index 8fb665f7a8..9388a36de1 100644 --- a/GPU/Directx9/GPU_DX9.h +++ b/GPU/Directx9/GPU_DX9.h @@ -73,7 +73,7 @@ public: primaryInfo = reportingPrimaryInfo_; fullInfo = reportingFullInfo_; } - std::vector GetFramebufferList(); + std::vector GetFramebufferList() override; bool GetCurrentFramebuffer(GPUDebugBuffer &buffer); bool GetCurrentDepthbuffer(GPUDebugBuffer &buffer); diff --git a/GPU/GLES/Framebuffer.h b/GPU/GLES/Framebuffer.h index 5efe76a67a..9293e94df7 100644 --- a/GPU/GLES/Framebuffer.h +++ b/GPU/GLES/Framebuffer.h @@ -121,19 +121,19 @@ public: struct CardboardSettings * GetCardboardSettings(struct CardboardSettings * cardboardSettings); protected: - virtual void DisableState() override; - virtual void ClearBuffer(bool keepState = false) override; - virtual void FlushBeforeCopy() override; - virtual void DecimateFBOs() override; + void DisableState() override; + void ClearBuffer(bool keepState = false) override; + void FlushBeforeCopy() override; + void DecimateFBOs() override; // Used by ReadFramebufferToMemory and later framebuffer block copies - virtual void BlitFramebuffer(VirtualFramebuffer *dst, int dstX, int dstY, VirtualFramebuffer *src, int srcX, int srcY, int w, int h, int bpp) override; + void BlitFramebuffer(VirtualFramebuffer *dst, int dstX, int dstY, VirtualFramebuffer *src, int srcX, int srcY, int w, int h, int bpp) override; - virtual void NotifyRenderFramebufferCreated(VirtualFramebuffer *vfb) override; - virtual void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override; - virtual void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override; - virtual bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; - virtual void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; + void NotifyRenderFramebufferCreated(VirtualFramebuffer *vfb) override; + void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override; + void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override; + bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; + void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; private: void MakePixelTexture(const u8 *srcPixels, GEBufferFormat srcPixelFormat, int srcStride, int width, int height); diff --git a/GPU/Vulkan/FramebufferVulkan.h b/GPU/Vulkan/FramebufferVulkan.h index c6dd64864b..46142a6df3 100644 --- a/GPU/Vulkan/FramebufferVulkan.h +++ b/GPU/Vulkan/FramebufferVulkan.h @@ -147,19 +147,19 @@ public: } protected: - virtual void DisableState() override {} - virtual void ClearBuffer(bool keepState = false); - virtual void FlushBeforeCopy() override; - virtual void DecimateFBOs() override; + void DisableState() override {} + void ClearBuffer(bool keepState = false) override; + void FlushBeforeCopy() override; + void DecimateFBOs() override; // Used by ReadFramebufferToMemory and later framebuffer block copies - virtual void BlitFramebuffer(VirtualFramebuffer *dst, int dstX, int dstY, VirtualFramebuffer *src, int srcX, int srcY, int w, int h, int bpp) override; + void BlitFramebuffer(VirtualFramebuffer *dst, int dstX, int dstY, VirtualFramebuffer *src, int srcX, int srcY, int w, int h, int bpp) override; - virtual void NotifyRenderFramebufferCreated(VirtualFramebuffer *vfb) override; - virtual void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override; - virtual void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override; - virtual bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; - virtual void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; + void NotifyRenderFramebufferCreated(VirtualFramebuffer *vfb) override; + void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override; + void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override; + bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; + void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; private: diff --git a/GPU/Vulkan/GPU_Vulkan.h b/GPU/Vulkan/GPU_Vulkan.h index e7d9ab35bd..60c8f5fcaa 100644 --- a/GPU/Vulkan/GPU_Vulkan.h +++ b/GPU/Vulkan/GPU_Vulkan.h @@ -39,8 +39,8 @@ public: void CheckGPUFeatures(); // These are where we can reset command buffers etc. - void BeginHostFrame(); - void EndHostFrame(); + void BeginHostFrame() override; + void EndHostFrame() override; void InitClear() override; void Reinitialize() override; @@ -145,9 +145,9 @@ public: // Using string because it's generic - makes no assumptions on the size of the shader IDs of this backend. std::vector DebugGetShaderIDs(DebugShaderType shader) override; std::string DebugGetShaderString(std::string id, DebugShaderType shader, DebugShaderStringType stringType) override; - std::vector GetFramebufferList(); - bool GetCurrentSimpleVertices(int count, std::vector &vertices, std::vector &indices); - bool DescribeCodePtr(const u8 *ptr, std::string &name); + std::vector GetFramebufferList() override; + bool GetCurrentSimpleVertices(int count, std::vector &vertices, std::vector &indices) override; + bool DescribeCodePtr(const u8 *ptr, std::string &name) override; protected: diff --git a/GPU/Vulkan/TextureCacheVulkan.h b/GPU/Vulkan/TextureCacheVulkan.h index b4a091ac3a..8bc086b1ab 100644 --- a/GPU/Vulkan/TextureCacheVulkan.h +++ b/GPU/Vulkan/TextureCacheVulkan.h @@ -121,7 +121,7 @@ public: void ApplyTexture(VulkanPushBuffer *uploadBuffer, VkImageView &imageView, VkSampler &sampler); protected: - void DownloadFramebufferForClut(u32 clutAddr, u32 bytes); + void DownloadFramebufferForClut(u32 clutAddr, u32 bytes) override; private: void Decimate(); // Run this once per frame to get rid of old textures. diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 0cb3a492ad..290ae9ac63 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -102,7 +102,7 @@ public: } protected: - virtual UI::Size PopupWidth() const { return 500; } + UI::Size PopupWidth() const override { return 500; } private: UI::EventReturn OnDeleteButtonClick(UI::EventParams &e); diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp index 5b5cf1b084..786d5c0a61 100644 --- a/ext/native/thin3d/thin3d_vulkan.cpp +++ b/ext/native/thin3d/thin3d_vulkan.cpp @@ -402,8 +402,8 @@ public: void Clear(int mask, uint32_t colorval, float depthVal, int stencilVal) override; - virtual void Begin(bool clear, uint32_t colorval, float depthVal, int stencilVal); - virtual void End(); + void Begin(bool clear, uint32_t colorval, float depthVal, int stencilVal) override; + void End() override; std::string GetInfoString(T3DInfo info) const override { // TODO: Make these actually query the right information @@ -562,7 +562,7 @@ public: void SetImageData(int x, int y, int z, int width, int height, int depth, int level, int stride, const uint8_t *data) override; void Finalize(int zim_flags) override; - void AutoGenMipmaps() {} + void AutoGenMipmaps() override {} VkImageView GetImageView() { return vkTex_->GetImageView(); }