Run code through clang-modernize -add-override to add 'override' decls.

This commit is contained in:
comex
2013-10-29 01:34:26 -04:00
parent c579637eaf
commit 21610c2e54
45 changed files with 296 additions and 296 deletions

View File

@ -49,10 +49,10 @@ struct XFBSource : public XFBSourceBase
XFBSource(GLuint tex) : texture(tex) {}
~XFBSource();
void CopyEFB(float Gamma);
void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
void CopyEFB(float Gamma) override;
void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) override;
void Draw(const MathUtil::Rectangle<float> &sourcerc,
const MathUtil::Rectangle<float> &drawrc, int width, int height) const;
const MathUtil::Rectangle<float> &drawrc, int width, int height) const override;
const GLuint texture;
};
@ -99,10 +99,10 @@ public:
static void ReinterpretPixelData(unsigned int convtype);
private:
XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height);
void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc);
XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height) override;
void GetTargetSize(unsigned int *width, unsigned int *height, const EFBRectangle& sourceRc) override;
void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma);
void CopyToRealXFB(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc,float Gamma) override;
static int m_targetWidth;
static int m_targetHeight;

View File

@ -11,11 +11,11 @@ public:
PerfQuery();
~PerfQuery();
void EnableQuery(PerfQueryGroup type);
void DisableQuery(PerfQueryGroup type);
void ResetQuery();
u32 GetQueryResult(PerfQueryType type);
void FlushResults();
void EnableQuery(PerfQueryGroup type) override;
void DisableQuery(PerfQueryGroup type) override;
void ResetQuery() override;
u32 GetQueryResult(PerfQueryType type) override;
void FlushResults() override;
bool IsFlushed() const;
private:

View File

@ -97,7 +97,7 @@ private:
class ProgramShaderCacheInserter : public LinearDiskCacheReader<SHADERUID, u8>
{
public:
void Read(const SHADERUID &key, const u8 *value, u32 value_size);
void Read(const SHADERUID &key, const u8 *value, u32 value_size) override;
};
static PCache pshaders;

View File

@ -46,39 +46,39 @@ public:
static void Init();
static void Shutdown();
void SetColorMask();
void SetBlendMode(bool forceUpdate);
void SetScissorRect(const TargetRectangle& rc);
void SetGenerationMode();
void SetDepthMode();
void SetLogicOpMode();
void SetDitherMode();
void SetLineWidth();
void SetSamplerState(int stage,int texindex);
void SetInterlacingMode();
void SetColorMask() override;
void SetBlendMode(bool forceUpdate) override;
void SetScissorRect(const TargetRectangle& rc) override;
void SetGenerationMode() override;
void SetDepthMode() override;
void SetLogicOpMode() override;
void SetDitherMode() override;
void SetLineWidth() override;
void SetSamplerState(int stage,int texindex) override;
void SetInterlacingMode() override;
// TODO: Implement and use these
void ApplyState(bool bUseDstAlpha) {}
void RestoreState() {}
void ApplyState(bool bUseDstAlpha) override {}
void RestoreState() override {}
void RenderText(const char* pstr, int left, int top, u32 color);
void RenderText(const char* pstr, int left, int top, u32 color) override;
void DrawDebugInfo();
static void FlipImageData(u8 *data, int w, int h);
u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data);
u32 AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data) override;
void ResetAPIState();
void RestoreAPIState();
void ResetAPIState() override;
void RestoreAPIState() override;
TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc);
TargetRectangle ConvertEFBRectangle(const EFBRectangle& rc) override;
void Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc,float Gamma);
void Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc,float Gamma) override;
void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z);
void ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z) override;
void ReinterpretPixelData(unsigned int convtype);
void ReinterpretPixelData(unsigned int convtype) override;
void UpdateViewport();
void UpdateViewport() override;
static void TakeScreenshot(const TargetRectangle &rc, std::string filename);

View File

@ -45,23 +45,23 @@ private:
~TCacheEntry();
void Load(unsigned int width, unsigned int height,
unsigned int expanded_width, unsigned int level);
unsigned int expanded_width, unsigned int level) override;
void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
unsigned int srcFormat, const EFBRectangle& srcRect,
bool isIntensity, bool scaleByHalf, unsigned int cbufid,
const float *colmat);
const float *colmat) override;
void Bind(unsigned int stage);
void Bind(unsigned int stage) override;
bool Save(const char filename[], unsigned int level);
};
~TextureCache();
TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height,
unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt);
unsigned int expanded_width, unsigned int tex_levels, PC_TexFormat pcfmt) override;
TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h);
TCacheEntryBase* CreateRenderTargetTexture(unsigned int scaled_tex_w, unsigned int scaled_tex_h) override;
};
bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level);

View File

@ -19,8 +19,8 @@ namespace OGL
GLVertexFormat();
~GLVertexFormat();
virtual void Initialize(const PortableVertexDeclaration &_vtx_decl);
virtual void SetupVertexPointers();
virtual void Initialize(const PortableVertexDeclaration &_vtx_decl) override;
virtual void SetupVertexPointers() override;
GLuint VAO;
};
@ -32,9 +32,9 @@ class VertexManager : public ::VertexManager
public:
VertexManager();
~VertexManager();
NativeVertexFormat* CreateNativeVertexFormat();
void CreateDeviceObjects();
void DestroyDeviceObjects();
NativeVertexFormat* CreateNativeVertexFormat() override;
void CreateDeviceObjects() override;
void DestroyDeviceObjects() override;
// NativeVertexFormat use this
GLuint m_vertex_buffers;
@ -42,7 +42,7 @@ public:
GLuint m_last_vao;
private:
void Draw(u32 stride);
void vFlush();
void vFlush() override;
void PrepareDrawBuffers(u32 stride);
NativeVertexFormat *m_CurrentVertexFmt;
};

View File

@ -9,19 +9,19 @@ namespace OGL
class VideoBackend : public VideoBackendHardware
{
bool Initialize(void *&);
void Shutdown();
bool Initialize(void *&) override;
void Shutdown() override;
std::string GetName();
std::string GetDisplayName();
std::string GetName() override;
std::string GetDisplayName() override;
void Video_Prepare();
void Video_Cleanup();
void Video_Prepare() override;
void Video_Cleanup() override;
void ShowConfig(void* parent);
void ShowConfig(void* parent) override;
void UpdateFPSDisplay(const char*);
unsigned int PeekMessages();
void UpdateFPSDisplay(const char*) override;
unsigned int PeekMessages() override;
};
}