libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-27 10:20:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add some missing override definitions.

Browse Source
This commit is contained in:
Unknown W. Brackets 2016-04-24 10:57:56 -07:00
parent a0ce8025d6
commit b09c2b1f75
14 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/MIPS/ARM/ArmJit.h
View File

@ -166,7 +166,7 @@ public:
void CompNEON_ColorConv(MIPSOpcode op); void CompNEON_ColorConv(MIPSOpcode op);
void CompNEON_Vbfy(MIPSOpcode op); void CompNEON_Vbfy(MIPSOpcode op);
int Replace_fabsf(); int Replace_fabsf() override;
JitBlockCache *GetBlockCache() override { return &blocks; } JitBlockCache *GetBlockCache() override { return &blocks; }

12
Core/MIPS/ARM64/Arm64Jit.h
View File

@ -167,18 +167,18 @@ public:
void CompNEON_ColorConv(MIPSOpcode op); void CompNEON_ColorConv(MIPSOpcode op);
void CompNEON_Vbfy(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<u32> SaveAndClearEmuHackOps() override { return blocks.SaveAndClearEmuHackOps(); } std::vector<u32> SaveAndClearEmuHackOps() override { return blocks.SaveAndClearEmuHackOps(); }
void RestoreSavedEmuHackOps(std::vector<u32> saved) override { blocks.RestoreSavedEmuHackOps(saved); } void RestoreSavedEmuHackOps(std::vector<u32> saved) override { blocks.RestoreSavedEmuHackOps(saved); }
void ClearCache(); void ClearCache() override;
void InvalidateCache(); void InvalidateCache() override;
void InvalidateCacheAt(u32 em_address, int length = 4); void InvalidateCacheAt(u32 em_address, int length = 4) override;
void EatPrefix() { js.EatPrefix(); } void EatPrefix() override { js.EatPrefix(); }
const u8 *GetDispatcher() const override { const u8 *GetDispatcher() const override {
return dispatcher; return dispatcher;

2
Core/MIPS/IR/IRFrontend.h
View File

@ -84,7 +84,7 @@ public:
void Comp_ColorConv(MIPSOpcode op) override; void Comp_ColorConv(MIPSOpcode op) override;
void Comp_Vbfy(MIPSOpcode op) override; void Comp_Vbfy(MIPSOpcode op) override;
int Replace_fabsf(); int Replace_fabsf() override;
void DoState(PointerWrap &p); void DoState(PointerWrap &p);
bool CheckRounding(); // returns true if we need a do-over bool CheckRounding(); // returns true if we need a do-over

6
Core/MIPS/IR/IRJit.h
View File

@ -161,9 +161,9 @@ public:
std::vector<u32> SaveAndClearEmuHackOps() override { return blocks_.SaveAndClearEmuHackOps(); } std::vector<u32> SaveAndClearEmuHackOps() override { return blocks_.SaveAndClearEmuHackOps(); }
void RestoreSavedEmuHackOps(std::vector<u32> saved) override { blocks_.RestoreSavedEmuHackOps(saved); } void RestoreSavedEmuHackOps(std::vector<u32> saved) override { blocks_.RestoreSavedEmuHackOps(saved); }
void ClearCache(); void ClearCache() override;
void InvalidateCache(); void InvalidateCache() override;
void InvalidateCacheAt(u32 em_address, int length = 4); void InvalidateCacheAt(u32 em_address, int length = 4) override;
const u8 *GetDispatcher() const override { return nullptr; } const u8 *GetDispatcher() const override { return nullptr; }

12
Core/MIPS/MIPS/MipsJit.h
View File

@ -125,20 +125,20 @@ public:
void Comp_Vsgn(MIPSOpcode op) override {} void Comp_Vsgn(MIPSOpcode op) override {}
void Comp_Vocp(MIPSOpcode op) override {} void Comp_Vocp(MIPSOpcode op) override {}
void Comp_ColorConv(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) {} void Comp_Vbfy(MIPSOpcode op) {}
JitBlockCache *GetBlockCache() { return &blocks; } JitBlockCache *GetBlockCache() override { return &blocks; }
std::vector<u32> SaveAndClearEmuHackOps() override { return blocks.SaveAndClearEmuHackOps(); } std::vector<u32> SaveAndClearEmuHackOps() override { return blocks.SaveAndClearEmuHackOps(); }
void RestoreSavedEmuHackOps(std::vector<u32> saved) override { blocks.RestoreSavedEmuHackOps(saved); } void RestoreSavedEmuHackOps(std::vector<u32> saved) override { blocks.RestoreSavedEmuHackOps(saved); }
void ClearCache(); void ClearCache() override;
void InvalidateCache(); void InvalidateCache() override;
void InvalidateCacheAt(u32 em_address, int length = 4); void InvalidateCacheAt(u32 em_address, int length = 4) override;
void EatPrefix() { js.EatPrefix(); } void EatPrefix() override { js.EatPrefix(); }
private: private:
void GenerateFixedCode(); void GenerateFixedCode();

8
Core/MIPS/x86/Jit.h
View File

@ -154,21 +154,21 @@ public:
ApplyPrefixST(regs, js.prefixT, sz); ApplyPrefixST(regs, js.prefixT, sz);
} }
void GetVectorRegsPrefixD(u8 *regs, VectorSize sz, int vectorReg); void GetVectorRegsPrefixD(u8 *regs, VectorSize sz, int vectorReg);
void EatPrefix() { js.EatPrefix(); } void EatPrefix() override { js.EatPrefix(); }
void RestoreRoundingMode(bool force = false); void RestoreRoundingMode(bool force = false);
void ApplyRoundingMode(bool force = false); void ApplyRoundingMode(bool force = false);
void UpdateRoundingMode(); void UpdateRoundingMode();
JitBlockCache *GetBlockCache() { return &blocks; } JitBlockCache *GetBlockCache() override { return &blocks; }
MIPSOpcode GetOriginalOp(MIPSOpcode op) override; MIPSOpcode GetOriginalOp(MIPSOpcode op) override;
std::vector<u32> SaveAndClearEmuHackOps() override { return blocks.SaveAndClearEmuHackOps(); } std::vector<u32> SaveAndClearEmuHackOps() override { return blocks.SaveAndClearEmuHackOps(); }
void RestoreSavedEmuHackOps(std::vector<u32> saved) override { blocks.RestoreSavedEmuHackOps(saved); } void RestoreSavedEmuHackOps(std::vector<u32> saved) override { blocks.RestoreSavedEmuHackOps(saved); }
void ClearCache(); void ClearCache() override;
void InvalidateCache() 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)) { if (blocks.RangeMayHaveEmuHacks(em_address, em_address + length)) {
blocks.InvalidateICache(em_address, length); blocks.InvalidateICache(em_address, length);
} }

20
GPU/Directx9/FramebufferDX9.h
View File

@ -93,19 +93,19 @@ public:
LPDIRECT3DSURFACE9 GetOffscreenSurface(LPDIRECT3DSURFACE9 similarSurface, VirtualFramebuffer *vfb); LPDIRECT3DSURFACE9 GetOffscreenSurface(LPDIRECT3DSURFACE9 similarSurface, VirtualFramebuffer *vfb);
protected: protected:
virtual void DisableState() override; void DisableState() override;
virtual void ClearBuffer(bool keepState = false) override; void ClearBuffer(bool keepState = false) override;
virtual void FlushBeforeCopy() override; void FlushBeforeCopy() override;
virtual void DecimateFBOs() override; void DecimateFBOs() override;
// Used by ReadFramebufferToMemory and later framebuffer block copies // 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; void NotifyRenderFramebufferCreated(VirtualFramebuffer *vfb) override;
virtual void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override; void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override;
virtual void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override; void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override;
virtual bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override;
virtual void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override;
private: private:
void MakePixelTexture(const u8 *srcPixels, GEBufferFormat srcPixelFormat, int srcStride, int width, int height); void MakePixelTexture(const u8 *srcPixels, GEBufferFormat srcPixelFormat, int srcStride, int width, int height);

2
GPU/Directx9/GPU_DX9.h
View File

@ -73,7 +73,7 @@ public:
primaryInfo = reportingPrimaryInfo_; primaryInfo = reportingPrimaryInfo_;
fullInfo = reportingFullInfo_; fullInfo = reportingFullInfo_;
} }
std::vector<FramebufferInfo> GetFramebufferList(); std::vector<FramebufferInfo> GetFramebufferList() override;
bool GetCurrentFramebuffer(GPUDebugBuffer &buffer); bool GetCurrentFramebuffer(GPUDebugBuffer &buffer);
bool GetCurrentDepthbuffer(GPUDebugBuffer &buffer); bool GetCurrentDepthbuffer(GPUDebugBuffer &buffer);

20
GPU/GLES/Framebuffer.h
View File

@ -121,19 +121,19 @@ public:
struct CardboardSettings * GetCardboardSettings(struct CardboardSettings * cardboardSettings); struct CardboardSettings * GetCardboardSettings(struct CardboardSettings * cardboardSettings);
protected: protected:
virtual void DisableState() override; void DisableState() override;
virtual void ClearBuffer(bool keepState = false) override; void ClearBuffer(bool keepState = false) override;
virtual void FlushBeforeCopy() override; void FlushBeforeCopy() override;
virtual void DecimateFBOs() override; void DecimateFBOs() override;
// Used by ReadFramebufferToMemory and later framebuffer block copies // 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; void NotifyRenderFramebufferCreated(VirtualFramebuffer *vfb) override;
virtual void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override; void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override;
virtual void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override; void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override;
virtual bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override;
virtual void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override;
private: private:
void MakePixelTexture(const u8 *srcPixels, GEBufferFormat srcPixelFormat, int srcStride, int width, int height); void MakePixelTexture(const u8 *srcPixels, GEBufferFormat srcPixelFormat, int srcStride, int width, int height);

20
GPU/Vulkan/FramebufferVulkan.h
View File

@ -147,19 +147,19 @@ public:
} }
protected: protected:
virtual void DisableState() override {} void DisableState() override {}
virtual void ClearBuffer(bool keepState = false); void ClearBuffer(bool keepState = false) override;
virtual void FlushBeforeCopy() override; void FlushBeforeCopy() override;
virtual void DecimateFBOs() override; void DecimateFBOs() override;
// Used by ReadFramebufferToMemory and later framebuffer block copies // 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; void NotifyRenderFramebufferCreated(VirtualFramebuffer *vfb) override;
virtual void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override; void NotifyRenderFramebufferSwitched(VirtualFramebuffer *prevVfb, VirtualFramebuffer *vfb, bool isClearingDepth) override;
virtual void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override; void NotifyRenderFramebufferUpdated(VirtualFramebuffer *vfb, bool vfbFormatChanged) override;
virtual bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; bool CreateDownloadTempBuffer(VirtualFramebuffer *nvfb) override;
virtual void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override; void UpdateDownloadTempBuffer(VirtualFramebuffer *nvfb) override;
private: private:

10
GPU/Vulkan/GPU_Vulkan.h
View File

@ -39,8 +39,8 @@ public:
void CheckGPUFeatures(); void CheckGPUFeatures();
// These are where we can reset command buffers etc. // These are where we can reset command buffers etc.
void BeginHostFrame(); void BeginHostFrame() override;
void EndHostFrame(); void EndHostFrame() override;
void InitClear() override; void InitClear() override;
void Reinitialize() 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. // Using string because it's generic - makes no assumptions on the size of the shader IDs of this backend.
std::vector<std::string> DebugGetShaderIDs(DebugShaderType shader) override; std::vector<std::string> DebugGetShaderIDs(DebugShaderType shader) override;
std::string DebugGetShaderString(std::string id, DebugShaderType shader, DebugShaderStringType stringType) override; std::string DebugGetShaderString(std::string id, DebugShaderType shader, DebugShaderStringType stringType) override;
std::vector<FramebufferInfo> GetFramebufferList(); std::vector<FramebufferInfo> GetFramebufferList() override;
bool GetCurrentSimpleVertices(int count, std::vector<GPUDebugVertex> &vertices, std::vector<u16> &indices); bool GetCurrentSimpleVertices(int count, std::vector<GPUDebugVertex> &vertices, std::vector<u16> &indices) override;
bool DescribeCodePtr(const u8 *ptr, std::string &name); bool DescribeCodePtr(const u8 *ptr, std::string &name) override;
protected: protected:

2
GPU/Vulkan/TextureCacheVulkan.h
View File

@ -121,7 +121,7 @@ public:
void ApplyTexture(VulkanPushBuffer *uploadBuffer, VkImageView &imageView, VkSampler &sampler); void ApplyTexture(VulkanPushBuffer *uploadBuffer, VkImageView &imageView, VkSampler &sampler);
protected: protected:
void DownloadFramebufferForClut(u32 clutAddr, u32 bytes); void DownloadFramebufferForClut(u32 clutAddr, u32 bytes) override;
private: private:
void Decimate(); // Run this once per frame to get rid of old textures. void Decimate(); // Run this once per frame to get rid of old textures.

2
UI/SavedataScreen.cpp
View File

@ -102,7 +102,7 @@ public:
} }
protected: protected:
virtual UI::Size PopupWidth() const { return 500; } UI::Size PopupWidth() const override { return 500; }
private: private:
UI::EventReturn OnDeleteButtonClick(UI::EventParams &e); UI::EventReturn OnDeleteButtonClick(UI::EventParams &e);

6
ext/native/thin3d/thin3d_vulkan.cpp
View File

@ -402,8 +402,8 @@ public:
void Clear(int mask, uint32_t colorval, float depthVal, int stencilVal) override; void Clear(int mask, uint32_t colorval, float depthVal, int stencilVal) override;
virtual void Begin(bool clear, uint32_t colorval, float depthVal, int stencilVal); void Begin(bool clear, uint32_t colorval, float depthVal, int stencilVal) override;
virtual void End(); void End() override;
std::string GetInfoString(T3DInfo info) const override { std::string GetInfoString(T3DInfo info) const override {
// TODO: Make these actually query the right information // 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 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 Finalize(int zim_flags) override;
void AutoGenMipmaps() {} void AutoGenMipmaps() override {}
VkImageView GetImageView() { return vkTex_->GetImageView(); } VkImageView GetImageView() { return vkTex_->GetImageView(); }