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

@ -15,33 +15,33 @@ class PPCDebugInterface : public DebugInterface
{ {
public: public:
PPCDebugInterface(){} PPCDebugInterface(){}
virtual void disasm(unsigned int address, char *dest, int max_size); virtual void disasm(unsigned int address, char *dest, int max_size) override;
virtual void getRawMemoryString(int memory, unsigned int address, char *dest, int max_size); virtual void getRawMemoryString(int memory, unsigned int address, char *dest, int max_size) override;
virtual int getInstructionSize(int /*instruction*/) {return 4;} virtual int getInstructionSize(int /*instruction*/) override {return 4;}
virtual bool isAlive(); virtual bool isAlive() override;
virtual bool isBreakpoint(unsigned int address); virtual bool isBreakpoint(unsigned int address) override;
virtual void setBreakpoint(unsigned int address); virtual void setBreakpoint(unsigned int address) override;
virtual void clearBreakpoint(unsigned int address); virtual void clearBreakpoint(unsigned int address) override;
virtual void clearAllBreakpoints(); virtual void clearAllBreakpoints() override;
virtual void toggleBreakpoint(unsigned int address); virtual void toggleBreakpoint(unsigned int address) override;
virtual bool isMemCheck(unsigned int address); virtual bool isMemCheck(unsigned int address) override;
virtual void toggleMemCheck(unsigned int address); virtual void toggleMemCheck(unsigned int address) override;
virtual unsigned int readMemory(unsigned int address); virtual unsigned int readMemory(unsigned int address) override;
enum { enum {
EXTRAMEM_ARAM = 1, EXTRAMEM_ARAM = 1,
}; };
virtual unsigned int readExtraMemory(int memory, unsigned int address); virtual unsigned int readExtraMemory(int memory, unsigned int address) override;
virtual unsigned int readInstruction(unsigned int address); virtual unsigned int readInstruction(unsigned int address) override;
virtual unsigned int getPC(); virtual unsigned int getPC() override;
virtual void setPC(unsigned int address); virtual void setPC(unsigned int address) override;
virtual void step() {} virtual void step() override {}
virtual void breakNow(); virtual void breakNow() override;
virtual void runToBreakpoint(); virtual void runToBreakpoint() override;
virtual void insertBLR(unsigned int address, unsigned int value); virtual void insertBLR(unsigned int address, unsigned int value) override;
virtual int getColor(unsigned int address); virtual int getColor(unsigned int address) override;
virtual std::string getDescription(unsigned int address); virtual std::string getDescription(unsigned int address) override;
virtual void showJitResults(u32 address); virtual void showJitResults(u32 address) override;
}; };
#endif #endif

View File

@ -16,24 +16,24 @@ class DSPHLE : public DSPEmulator {
public: public:
DSPHLE(); DSPHLE();
virtual bool Initialize(bool bWii, bool bDSPThread); virtual bool Initialize(bool bWii, bool bDSPThread) override;
virtual void Shutdown(); virtual void Shutdown() override;
virtual bool IsLLE() { return false; } virtual bool IsLLE() override { return false ; }
virtual void DoState(PointerWrap &p); virtual void DoState(PointerWrap &p) override;
virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); virtual void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short); virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) override;
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short); virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) override;
virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox); virtual unsigned short DSP_ReadMailBoxHigh(bool _CPUMailbox) override;
virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox); virtual unsigned short DSP_ReadMailBoxLow(bool _CPUMailbox) override;
virtual unsigned short DSP_ReadControlRegister(); virtual unsigned short DSP_ReadControlRegister() override;
virtual unsigned short DSP_WriteControlRegister(unsigned short); virtual unsigned short DSP_WriteControlRegister(unsigned short) override;
virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples); virtual void DSP_SendAIBuffer(unsigned int address, unsigned int num_samples) override;
virtual void DSP_Update(int cycles); virtual void DSP_Update(int cycles) override;
virtual void DSP_StopSoundStream(); virtual void DSP_StopSoundStream() override;
virtual void DSP_ClearAudioBuffer(bool mute); virtual void DSP_ClearAudioBuffer(bool mute) override;
virtual u32 DSP_UpdateRate(); virtual u32 DSP_UpdateRate() override;
CMailHandler& AccessMailHandler() { return m_MailHandler; } CMailHandler& AccessMailHandler() { return m_MailHandler; }

View File

@ -15,7 +15,7 @@ public:
HLEMixer(DSPHLE *dsp_hle, unsigned int AISampleRate = 48000, unsigned int DACSampleRate = 48000, unsigned int BackendSampleRate = 32000) HLEMixer(DSPHLE *dsp_hle, unsigned int AISampleRate = 48000, unsigned int DACSampleRate = 48000, unsigned int BackendSampleRate = 32000)
: CMixer(AISampleRate, DACSampleRate, BackendSampleRate), m_DSPHLE(dsp_hle) {}; : CMixer(AISampleRate, DACSampleRate, BackendSampleRate), m_DSPHLE(dsp_hle) {};
virtual void Premix(short *samples, unsigned int numSamples); virtual void Premix(short *samples, unsigned int numSamples) override;
private: private:
DSPHLE *m_DSPHLE; DSPHLE *m_DSPHLE;
}; };

View File

@ -56,11 +56,11 @@ public:
CUCode_AX(DSPHLE* dsp_hle, u32 crc); CUCode_AX(DSPHLE* dsp_hle, u32 crc);
virtual ~CUCode_AX(); virtual ~CUCode_AX();
virtual void HandleMail(u32 mail); virtual void HandleMail(u32 mail) override;
virtual void MixAdd(short* out_buffer, int nsamples); virtual void MixAdd(short* out_buffer, int nsamples) override;
virtual void Update(int cycles); virtual void Update(int cycles) override;
virtual void DoState(PointerWrap& p); virtual void DoState(PointerWrap& p) override;
u32 GetUpdateMs(); u32 GetUpdateMs() override;
// Needed because StdThread.h std::thread implem does not support member // Needed because StdThread.h std::thread implem does not support member
// pointers. TODO(delroth): obsolete. // pointers. TODO(delroth): obsolete.

View File

@ -12,9 +12,9 @@ class CUCode_AXWii : public CUCode_AX
public: public:
CUCode_AXWii(DSPHLE *dsp_hle, u32 _CRC); CUCode_AXWii(DSPHLE *dsp_hle, u32 _CRC);
virtual ~CUCode_AXWii(); virtual ~CUCode_AXWii();
u32 GetUpdateMs(); u32 GetUpdateMs() override;
virtual void DoState(PointerWrap &p); virtual void DoState(PointerWrap &p) override;
protected: protected:
// Additional AUX buffers // Additional AUX buffers
@ -56,7 +56,7 @@ protected:
// but this gives better precision and nicer code. // but this gives better precision and nicer code.
void GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals); void GenerateVolumeRamp(u16* output, u16 vol1, u16 vol2, size_t nvals);
virtual void HandleCommandList(); virtual void HandleCommandList() override;
void SetupProcessing(u32 init_addr); void SetupProcessing(u32 init_addr);
void AddToLR(u32 val_addr, bool neg); void AddToLR(u32 val_addr, bool neg);

View File

@ -12,10 +12,10 @@ class CUCode_CARD : public IUCode
public: public:
CUCode_CARD(DSPHLE *dsp_hle, u32 crc); CUCode_CARD(DSPHLE *dsp_hle, u32 crc);
virtual ~CUCode_CARD(); virtual ~CUCode_CARD();
u32 GetUpdateMs(); u32 GetUpdateMs() override;
void HandleMail(u32 _uMail); void HandleMail(u32 _uMail) override;
void Update(int cycles); void Update(int cycles) override;
}; };
#endif #endif

View File

@ -10,8 +10,8 @@ struct CUCode_GBA : public IUCode
{ {
CUCode_GBA(DSPHLE *dsp_hle, u32 crc); CUCode_GBA(DSPHLE *dsp_hle, u32 crc);
virtual ~CUCode_GBA(); virtual ~CUCode_GBA();
u32 GetUpdateMs(); u32 GetUpdateMs() override;
void HandleMail(u32 _uMail); void HandleMail(u32 _uMail) override;
void Update(int cycles); void Update(int cycles) override;
}; };

View File

@ -12,10 +12,10 @@ class CUCode_InitAudioSystem : public IUCode
public: public:
CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc); CUCode_InitAudioSystem(DSPHLE *dsp_hle, u32 crc);
virtual ~CUCode_InitAudioSystem(); virtual ~CUCode_InitAudioSystem();
u32 GetUpdateMs(); u32 GetUpdateMs() override;
void HandleMail(u32 _uMail); void HandleMail(u32 _uMail) override;
void Update(int cycles); void Update(int cycles) override;
void Init(); void Init();
}; };

View File

@ -12,12 +12,12 @@ class CUCode_Rom : public IUCode
public: public:
CUCode_Rom(DSPHLE *dsp_hle, u32 _crc); CUCode_Rom(DSPHLE *dsp_hle, u32 _crc);
virtual ~CUCode_Rom(); virtual ~CUCode_Rom();
u32 GetUpdateMs(); u32 GetUpdateMs() override;
void HandleMail(u32 _uMail); void HandleMail(u32 _uMail) override;
void Update(int cycles); void Update(int cycles) override;
void DoState(PointerWrap &p); void DoState(PointerWrap &p) override;
private: private:
struct SUCode struct SUCode

View File

@ -120,20 +120,20 @@ class CUCode_Zelda : public IUCode
public: public:
CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC); CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC);
virtual ~CUCode_Zelda(); virtual ~CUCode_Zelda();
u32 GetUpdateMs(); u32 GetUpdateMs() override;
void HandleMail(u32 _uMail); void HandleMail(u32 _uMail) override;
void HandleMail_LightVersion(u32 _uMail); void HandleMail_LightVersion(u32 _uMail);
void HandleMail_SMSVersion(u32 _uMail); void HandleMail_SMSVersion(u32 _uMail);
void HandleMail_NormalVersion(u32 _uMail); void HandleMail_NormalVersion(u32 _uMail);
void Update(int cycles); void Update(int cycles) override;
void MixAdd(short* buffer, int size); void MixAdd(short* buffer, int size) override;
void CopyPBsFromRAM(); void CopyPBsFromRAM();
void CopyPBsToRAM(); void CopyPBsToRAM();
void DoState(PointerWrap &p); void DoState(PointerWrap &p) override;
int *templbuffer; int *templbuffer;
int *temprbuffer; int *temprbuffer;

View File

@ -16,7 +16,7 @@ public:
DSPSymbolDB() {} DSPSymbolDB() {}
~DSPSymbolDB() {} ~DSPSymbolDB() {}
Symbol *GetSymbolFromAddr(u32 addr); Symbol *GetSymbolFromAddr(u32 addr) override;
}; };

View File

@ -71,7 +71,7 @@ class CEXIDummy : public IEXIDevice
{ {
std::string m_strName; std::string m_strName;
void TransferByte(u8& _byte) {} void TransferByte(u8& _byte) override {}
public: public:
CEXIDummy(const std::string& _strName) : CEXIDummy(const std::string& _strName) :
@ -81,10 +81,10 @@ public:
virtual ~CEXIDummy(){} virtual ~CEXIDummy(){}
void ImmWrite(u32 data, u32 size) {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmWrite: %08x", m_strName.c_str(), data);} void ImmWrite(u32 data, u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmWrite: %08x", m_strName.c_str(), data);}
u32 ImmRead (u32 size) {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmRead", m_strName.c_str()); return 0;} u32 ImmRead (u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s ImmRead", m_strName.c_str()); return 0;}
void DMAWrite(u32 addr, u32 size) {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMAWrite: %08x bytes, from %08x to device", m_strName.c_str(), size, addr);} void DMAWrite(u32 addr, u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMAWrite: %08x bytes, from %08x to device", m_strName.c_str(), size, addr);}
void DMARead (u32 addr, u32 size) {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMARead: %08x bytes, from device to %08x", m_strName.c_str(), size, addr);} void DMARead (u32 addr, u32 size) override {INFO_LOG(EXPANSIONINTERFACE, "EXI DUMMY %s DMARead: %08x bytes, from device to %08x", m_strName.c_str(), size, addr);}
}; };

View File

@ -9,9 +9,9 @@ class CEXIAD16 : public IEXIDevice
{ {
public: public:
CEXIAD16(); CEXIAD16();
virtual void SetCS(int _iCS); virtual void SetCS(int _iCS) override;
virtual bool IsPresent(); virtual bool IsPresent() override;
virtual void DoState(PointerWrap &p); virtual void DoState(PointerWrap &p) override;
private: private:
enum enum
@ -32,7 +32,7 @@ private:
u32 m_uCommand; u32 m_uCommand;
UAD16Reg m_uAD16Register; UAD16Reg m_uAD16Register;
virtual void TransferByte(u8& _uByte); virtual void TransferByte(u8& _uByte) override;
}; };
#endif #endif

View File

@ -10,13 +10,13 @@ class CEXIAMBaseboard : public IEXIDevice
public: public:
CEXIAMBaseboard(); CEXIAMBaseboard();
virtual void SetCS(int _iCS); virtual void SetCS(int _iCS) override;
virtual bool IsPresent(); virtual bool IsPresent() override;
virtual bool IsInterruptSet(); virtual bool IsInterruptSet() override;
virtual void DoState(PointerWrap &p); virtual void DoState(PointerWrap &p) override;
private: private:
virtual void TransferByte(u8& _uByte); virtual void TransferByte(u8& _uByte) override;
int m_position; int m_position;
bool m_have_irq; bool m_have_irq;
unsigned char m_command[4]; unsigned char m_command[4];

View File

@ -189,14 +189,14 @@ class CEXIETHERNET : public IEXIDevice
public: public:
CEXIETHERNET(); CEXIETHERNET();
virtual ~CEXIETHERNET(); virtual ~CEXIETHERNET();
void SetCS(int cs); void SetCS(int cs) override;
bool IsPresent(); bool IsPresent() override;
bool IsInterruptSet(); bool IsInterruptSet() override;
void ImmWrite(u32 data, u32 size); void ImmWrite(u32 data, u32 size) override;
u32 ImmRead(u32 size); u32 ImmRead(u32 size) override;
void DMAWrite(u32 addr, u32 size); void DMAWrite(u32 addr, u32 size) override;
void DMARead(u32 addr, u32 size); void DMARead(u32 addr, u32 size) override;
void DoState(PointerWrap &p); void DoState(PointerWrap &p) override;
//private: //private:
struct struct

View File

@ -48,8 +48,8 @@ class CEXIGecko
{ {
public: public:
CEXIGecko() {} CEXIGecko() {}
bool IsPresent() { return true; } bool IsPresent() override { return true; }
void ImmReadWrite(u32 &_uData, u32 _uSize); void ImmReadWrite(u32 &_uData, u32 _uSize) override;
private: private:
enum enum

View File

@ -21,13 +21,13 @@ class CEXIMemoryCard : public IEXIDevice
public: public:
CEXIMemoryCard(const int index); CEXIMemoryCard(const int index);
virtual ~CEXIMemoryCard(); virtual ~CEXIMemoryCard();
void SetCS(int cs); void SetCS(int cs) override;
void Update(); void Update() override;
bool IsInterruptSet(); bool IsInterruptSet() override;
bool IsPresent(); bool IsPresent() override;
void DoState(PointerWrap &p); void DoState(PointerWrap &p) override;
void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1); IEXIDevice* FindDevice(TEXIDevices device_type, int customIndex=-1) override;
private: private:
// This is scheduled whenever a page write is issued. The this pointer is passed // This is scheduled whenever a page write is issued. The this pointer is passed
@ -89,7 +89,7 @@ private:
std::thread flushThread; std::thread flushThread;
protected: protected:
virtual void TransferByte(u8 &byte); virtual void TransferByte(u8 &byte) override;
}; };
#endif #endif

View File

@ -20,9 +20,9 @@ public:
bool GetMicButton() const; bool GetMicButton() const;
std::string GetName() const; std::string GetName() const override;
void LoadDefaults(const ControllerInterface& ciface); void LoadDefaults(const ControllerInterface& ciface) override;
private: private:

View File

@ -44,15 +44,15 @@ public:
CSIDevice_Null(SIDevices device, int _iDeviceNumber) : ISIDevice(device, _iDeviceNumber) {} CSIDevice_Null(SIDevices device, int _iDeviceNumber) : ISIDevice(device, _iDeviceNumber) {}
virtual ~CSIDevice_Null() {} virtual ~CSIDevice_Null() {}
int RunBuffer(u8* _pBuffer, int _iLength) { int RunBuffer(u8* _pBuffer, int _iLength) override {
reinterpret_cast<u32*>(_pBuffer)[0] = SI_ERROR_NO_RESPONSE; reinterpret_cast<u32*>(_pBuffer)[0] = SI_ERROR_NO_RESPONSE;
return 4; return 4;
} }
bool GetData(u32& _Hi, u32& _Low) { bool GetData(u32& _Hi, u32& _Low) override {
_Hi = 0x80000000; _Hi = 0x80000000;
return true; return true;
} }
void SendCommand(u32 _Cmd, u8 _Poll) {} void SendCommand(u32 _Cmd, u8 _Poll) override {}
}; };

View File

@ -20,13 +20,13 @@ public:
CSIDevice_AMBaseboard(SIDevices device, int _iDeviceNumber); CSIDevice_AMBaseboard(SIDevices device, int _iDeviceNumber);
// run the SI Buffer // run the SI Buffer
virtual int RunBuffer(u8* _pBuffer, int _iLength); virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
// return true on new data // return true on new data
virtual bool GetData(u32& _Hi, u32& _Low); virtual bool GetData(u32& _Hi, u32& _Low) override;
// send a command directly // send a command directly
virtual void SendCommand(u32 _Cmd, u8 _Poll); virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
}; };
#endif // _SIDEVICE_AMBASEBOARD_H #endif // _SIDEVICE_AMBASEBOARD_H

View File

@ -86,20 +86,20 @@ public:
CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber); CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber);
// Run the SI Buffer // Run the SI Buffer
virtual int RunBuffer(u8* _pBuffer, int _iLength); virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
// Send and Receive pad input from network // Send and Receive pad input from network
static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus); static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
static u8 NetPlay_InGamePadToLocalPad(u8 numPAD); static u8 NetPlay_InGamePadToLocalPad(u8 numPAD);
// Return true on new data // Return true on new data
virtual bool GetData(u32& _Hi, u32& _Low); virtual bool GetData(u32& _Hi, u32& _Low) override;
// Send a command directly // Send a command directly
virtual void SendCommand(u32 _Cmd, u8 _Poll); virtual void SendCommand(u32 _Cmd, u8 _Poll) override;
// Savestate support // Savestate support
virtual void DoState(PointerWrap& p); virtual void DoState(PointerWrap& p) override;
}; };
#endif #endif

View File

@ -39,10 +39,10 @@ public:
~CSIDevice_GBA() {} ~CSIDevice_GBA() {}
// Run the SI Buffer // Run the SI Buffer
virtual int RunBuffer(u8* _pBuffer, int _iLength); virtual int RunBuffer(u8* _pBuffer, int _iLength) override;
virtual bool GetData(u32& _Hi, u32& _Low) { return true; } virtual bool GetData(u32& _Hi, u32& _Low) override { return true; }
virtual void SendCommand(u32 _Cmd, u8 _Poll) {} virtual void SendCommand(u32 _Cmd, u8 _Poll) override {}
}; };
#endif #endif

View File

@ -18,7 +18,7 @@ public:
virtual void GetState( u8* const data, const bool focus = true ) {} virtual void GetState( u8* const data, const bool focus = true ) {}
void Reset(); void Reset();
std::string GetName() const; std::string GetName() const override;
const char* const name; const char* const name;
WiimoteEmu::ExtensionReg& reg; WiimoteEmu::ExtensionReg& reg;

View File

@ -11,7 +11,7 @@ class Guitar : public Attachment
{ {
public: public:
Guitar(WiimoteEmu::ExtensionReg& _reg); Guitar(WiimoteEmu::ExtensionReg& _reg);
void GetState( u8* const data, const bool focus ); void GetState( u8* const data, const bool focus ) override;
enum enum
{ {

View File

@ -17,7 +17,7 @@ class Nunchuk : public Attachment
public: public:
Nunchuk(UDPWrapper * wrp, WiimoteEmu::ExtensionReg& _reg); Nunchuk(UDPWrapper * wrp, WiimoteEmu::ExtensionReg& _reg);
virtual void GetState( u8* const data, const bool focus ); virtual void GetState( u8* const data, const bool focus ) override;
enum enum
{ {
@ -25,7 +25,7 @@ public:
BUTTON_Z = 0x01, BUTTON_Z = 0x01,
}; };
void LoadDefaults(const ControllerInterface& ciface); void LoadDefaults(const ControllerInterface& ciface) override;
private: private:
Tilt* m_tilt; Tilt* m_tilt;

View File

@ -11,7 +11,7 @@ class Turntable : public Attachment
{ {
public: public:
Turntable(WiimoteEmu::ExtensionReg& _reg); Turntable(WiimoteEmu::ExtensionReg& _reg);
void GetState(u8* const data, const bool focus); void GetState(u8* const data, const bool focus) override;
enum enum
{ {

View File

@ -19,15 +19,15 @@
class Interpreter : public CPUCoreBase class Interpreter : public CPUCoreBase
{ {
public: public:
void Init(); void Init() override;
void Shutdown(); void Shutdown() override;
void Reset(); void Reset();
void SingleStep(); void SingleStep() override;
int SingleStepInner(); int SingleStepInner();
void Run(); void Run() override;
void ClearCache(); void ClearCache() override;
const char *GetName(); const char *GetName() override;
typedef void (*_interpreterInstruction)(UGeckoInstruction instCode); typedef void (*_interpreterInstruction)(UGeckoInstruction instCode);

View File

@ -62,30 +62,30 @@ public:
Jit64() : code_buffer(32000) {} Jit64() : code_buffer(32000) {}
~Jit64() {} ~Jit64() {}
void Init(); void Init() override;
void Shutdown(); void Shutdown() override;
// Jit! // Jit!
void Jit(u32 em_address); void Jit(u32 em_address) override;
const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b); const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b);
u32 RegistersInUse(); u32 RegistersInUse();
JitBlockCache *GetBlockCache() { return &blocks; } JitBlockCache *GetBlockCache() override { return &blocks; }
void Trace(); void Trace();
void ClearCache(); void ClearCache() override;
const u8 *GetDispatcher() { const u8 *GetDispatcher() {
return asm_routines.dispatcher; return asm_routines.dispatcher;
} }
const CommonAsmRoutines *GetAsmRoutines() { const CommonAsmRoutines *GetAsmRoutines() override {
return &asm_routines; return &asm_routines;
} }
const char *GetName() { const char *GetName() override {
#ifdef _M_X64 #ifdef _M_X64
return "JIT64"; return "JIT64";
#else #else
@ -94,8 +94,8 @@ public:
} }
// Run! // Run!
void Run(); void Run() override;
void SingleStep(); void SingleStep() override;
// Utilities for use by opcodes // Utilities for use by opcodes

View File

@ -121,11 +121,11 @@ public:
class GPRRegCache : public RegCache class GPRRegCache : public RegCache
{ {
public: public:
void Start(PPCAnalyst::BlockRegStats &stats); void Start(PPCAnalyst::BlockRegStats &stats) override;
void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true); void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override;
void StoreFromRegister(int preg); void StoreFromRegister(int preg) override;
OpArg GetDefaultLocation(int reg) const; OpArg GetDefaultLocation(int reg) const override;
const int *GetAllocationOrder(int &count); const int *GetAllocationOrder(int &count) override;
void SetImmediate32(int preg, u32 immValue); void SetImmediate32(int preg, u32 immValue);
}; };
@ -133,11 +133,11 @@ public:
class FPURegCache : public RegCache class FPURegCache : public RegCache
{ {
public: public:
void Start(PPCAnalyst::BlockRegStats &stats); void Start(PPCAnalyst::BlockRegStats &stats) override;
void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true); void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override;
void StoreFromRegister(int preg); void StoreFromRegister(int preg) override;
const int *GetAllocationOrder(int &count); const int *GetAllocationOrder(int &count) override;
OpArg GetDefaultLocation(int reg) const; OpArg GetDefaultLocation(int reg) const override;
}; };
#endif // _JIT64REGCACHE_H #endif // _JIT64REGCACHE_H

View File

@ -70,31 +70,31 @@ public:
// Initialization, etc // Initialization, etc
void Init(); void Init() override;
void Shutdown(); void Shutdown() override;
// Jit! // Jit!
void Jit(u32 em_address); void Jit(u32 em_address) override;
const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b); const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b);
void Trace(); void Trace();
JitBlockCache *GetBlockCache() { return &blocks; } JitBlockCache *GetBlockCache() override { return &blocks; }
const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) { return NULL; }; const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) override { return NULL; };
bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } bool IsInCodeSpace(u8 *ptr) override { return IsInSpace(ptr); }
void ClearCache(); void ClearCache() override;
const u8 *GetDispatcher() { const u8 *GetDispatcher() {
return asm_routines.dispatcher; // asm_routines.dispatcher return asm_routines.dispatcher; // asm_routines.dispatcher
} }
const CommonAsmRoutines *GetAsmRoutines() { const CommonAsmRoutines *GetAsmRoutines() override {
return &asm_routines; return &asm_routines;
} }
const char *GetName() { const char *GetName() override {
#ifdef _M_X64 #ifdef _M_X64
return "JIT64IL"; return "JIT64IL";
#else #else
@ -104,8 +104,8 @@ public:
// Run! // Run!
void Run(); void Run() override;
void SingleStep(); void SingleStep() override;
// Utilities for use by opcodes // Utilities for use by opcodes
@ -128,16 +128,16 @@ public:
void WriteCode(); void WriteCode();
// OPCODES // OPCODES
void unknown_instruction(UGeckoInstruction _inst); void unknown_instruction(UGeckoInstruction _inst) override;
void Default(UGeckoInstruction _inst); void Default(UGeckoInstruction _inst) override;
void DoNothing(UGeckoInstruction _inst); void DoNothing(UGeckoInstruction _inst) override;
void HLEFunction(UGeckoInstruction _inst); void HLEFunction(UGeckoInstruction _inst) override;
void DynaRunTable4(UGeckoInstruction _inst); void DynaRunTable4(UGeckoInstruction _inst) override;
void DynaRunTable19(UGeckoInstruction _inst); void DynaRunTable19(UGeckoInstruction _inst) override;
void DynaRunTable31(UGeckoInstruction _inst); void DynaRunTable31(UGeckoInstruction _inst) override;
void DynaRunTable59(UGeckoInstruction _inst); void DynaRunTable59(UGeckoInstruction _inst) override;
void DynaRunTable63(UGeckoInstruction _inst); void DynaRunTable63(UGeckoInstruction _inst) override;
}; };
void Jit(u32 em_address); void Jit(u32 em_address);

View File

@ -95,11 +95,11 @@ protected:
JitBlockCache blocks; JitBlockCache blocks;
TrampolineCache trampolines; TrampolineCache trampolines;
public: public:
JitBlockCache *GetBlockCache() { return &blocks; } JitBlockCache *GetBlockCache() override { return &blocks; }
const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx); const u8 *BackPatch(u8 *codePtr, u32 em_address, void *ctx) override;
bool IsInCodeSpace(u8 *ptr) { return IsInSpace(ptr); } bool IsInCodeSpace(u8 *ptr) override { return IsInSpace(ptr); }
}; };
extern JitBase *jit; extern JitBase *jit;

View File

@ -128,7 +128,7 @@ public:
class JitBlockCache : public JitBaseBlockCache class JitBlockCache : public JitBaseBlockCache
{ {
private: private:
void WriteLinkBlock(u8* location, const u8* address); void WriteLinkBlock(u8* location, const u8* address) override;
void WriteDestroyBlock(const u8* location, u32 address); void WriteDestroyBlock(const u8* location, u32 address) override;
}; };
#endif #endif

View File

@ -23,10 +23,10 @@ public:
PPCSymbolDB(); PPCSymbolDB();
~PPCSymbolDB(); ~PPCSymbolDB();
Symbol *AddFunction(u32 startAddr); Symbol *AddFunction(u32 startAddr) override;
void AddKnownSymbol(u32 startAddr, u32 size, const char *name, int type = Symbol::SYMBOL_FUNCTION); void AddKnownSymbol(u32 startAddr, u32 size, const char *name, int type = Symbol::SYMBOL_FUNCTION);
Symbol *GetSymbolFromAddr(u32 addr); Symbol *GetSymbolFromAddr(u32 addr) override;
const char *GetDescription(u32 addr); const char *GetDescription(u32 addr);

View File

@ -92,24 +92,24 @@ public:
virtual ~CNANDContentLoader(); virtual ~CNANDContentLoader();
bool IsValid() const { return m_Valid; } bool IsValid() const override { return m_Valid; }
void RemoveTitle(void) const; void RemoveTitle(void) const override;
u64 GetTitleID() const { return m_TitleID; } u64 GetTitleID() const override { return m_TitleID; }
u16 GetIosVersion() const { return m_IosVersion; } u16 GetIosVersion() const override { return m_IosVersion; }
u32 GetBootIndex() const { return m_BootIndex; } u32 GetBootIndex() const override { return m_BootIndex; }
size_t GetContentSize() const { return m_Content.size(); } size_t GetContentSize() const override { return m_Content.size(); }
const SNANDContent* GetContentByIndex(int _Index) const; const SNANDContent* GetContentByIndex(int _Index) const override;
const u8* GetTMDView() const { return m_TMDView; } const u8* GetTMDView() const override { return m_TMDView; }
const u8* GetTMDHeader() const { return m_TMDHeader; } const u8* GetTMDHeader() const override { return m_TMDHeader; }
u32 GetTIKSize() const { return m_TIKSize; } u32 GetTIKSize() const override { return m_TIKSize; }
const u8* GetTIK() const { return m_TIK; } const u8* GetTIK() const override { return m_TIK; }
const std::vector<SNANDContent>& GetContent() const { return m_Content; } const std::vector<SNANDContent>& GetContent() const override { return m_Content; }
u16 GetTitleVersion() const {return m_TitleVersion;} u16 GetTitleVersion() const override {return m_TitleVersion;}
u16 GetNumEntries() const {return m_numEntries;} u16 GetNumEntries() const override {return m_numEntries;}
DiscIO::IVolume::ECountry GetCountry() const; DiscIO::IVolume::ECountry GetCountry() const override;
u8 GetCountryChar() const {return m_Country; } u8 GetCountryChar() const override {return m_Country; }
private: private:

View File

@ -919,7 +919,7 @@ public:
Create(); Create();
} }
virtual ExitCode Entry() virtual ExitCode Entry() override
{ {
return (ExitCode)m_Partition.Partition->CheckIntegrity(); return (ExitCode)m_Partition.Partition->CheckIntegrity();
} }

View File

@ -222,22 +222,22 @@ public:
ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {} ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {}
virtual ControlState GetValue() virtual ControlState GetValue() override
{ {
return control->ToInput()->GetState(); return control->ToInput()->GetState();
} }
virtual void SetValue(ControlState value) virtual void SetValue(ControlState value) override
{ {
control->ToOutput()->SetState(value); control->ToOutput()->SetState(value);
} }
virtual int CountNumControls() virtual int CountNumControls() override
{ {
return 1; return 1;
} }
virtual operator std::string() virtual operator std::string() override
{ {
return "`" + (std::string)qualifier + "`"; return "`" + (std::string)qualifier + "`";
} }
@ -257,7 +257,7 @@ public:
delete rhs; delete rhs;
} }
virtual ControlState GetValue() virtual ControlState GetValue() override
{ {
ControlState lhsValue = lhs->GetValue(); ControlState lhsValue = lhs->GetValue();
ControlState rhsValue = rhs->GetValue(); ControlState rhsValue = rhs->GetValue();
@ -275,7 +275,7 @@ public:
} }
} }
virtual void SetValue(ControlState value) virtual void SetValue(ControlState value) override
{ {
// Don't do anything special with the op we have. // Don't do anything special with the op we have.
// Treat "A & B" the same as "A | B". // Treat "A & B" the same as "A | B".
@ -283,12 +283,12 @@ public:
rhs->SetValue(value); rhs->SetValue(value);
} }
virtual int CountNumControls() virtual int CountNumControls() override
{ {
return lhs->CountNumControls() + rhs->CountNumControls(); return lhs->CountNumControls() + rhs->CountNumControls();
} }
virtual operator std::string() virtual operator std::string() override
{ {
return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")"; return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
} }
@ -306,7 +306,7 @@ public:
delete inner; delete inner;
} }
virtual ControlState GetValue() virtual ControlState GetValue() override
{ {
ControlState value = inner->GetValue(); ControlState value = inner->GetValue();
switch (op) switch (op)
@ -319,7 +319,7 @@ public:
} }
} }
virtual void SetValue(ControlState value) virtual void SetValue(ControlState value) override
{ {
switch (op) switch (op)
{ {
@ -330,12 +330,12 @@ public:
} }
} }
virtual int CountNumControls() virtual int CountNumControls() override
{ {
return inner->CountNumControls(); return inner->CountNumControls();
} }
virtual operator std::string() virtual operator std::string() override
{ {
return OpName(op) + "(" + (std::string)(*inner) + ")"; return OpName(op) + "(" + (std::string)(*inner) + ")";
} }

View File

@ -43,9 +43,9 @@ private:
class Button : public Core::Device::Input class Button : public Core::Device::Input
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
Button(u8 index, SDL_Joystick* js) : m_js(js), m_index(index) {} Button(u8 index, SDL_Joystick* js) : m_js(js), m_index(index) {}
ControlState GetState() const; ControlState GetState() const override;
private: private:
SDL_Joystick* const m_js; SDL_Joystick* const m_js;
const u8 m_index; const u8 m_index;
@ -54,9 +54,9 @@ private:
class Axis : public Core::Device::Input class Axis : public Core::Device::Input
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
Axis(u8 index, SDL_Joystick* js, Sint16 range) : m_js(js), m_range(range), m_index(index) {} Axis(u8 index, SDL_Joystick* js, Sint16 range) : m_js(js), m_range(range), m_index(index) {}
ControlState GetState() const; ControlState GetState() const override;
private: private:
SDL_Joystick* const m_js; SDL_Joystick* const m_js;
const Sint16 m_range; const Sint16 m_range;
@ -66,9 +66,9 @@ private:
class Hat : public Input class Hat : public Input
{ {
public: public:
std::string GetName() const; std::string GetName() const override;
Hat(u8 index, SDL_Joystick* js, u8 direction) : m_js(js), m_direction(direction), m_index(index) {} Hat(u8 index, SDL_Joystick* js, u8 direction) : m_js(js), m_direction(direction), m_index(index) {}
ControlState GetState() const; ControlState GetState() const override;
private: private:
SDL_Joystick* const m_js; SDL_Joystick* const m_js;
const u8 m_direction; const u8 m_direction;
@ -130,15 +130,15 @@ private:
#endif #endif
public: public:
bool UpdateInput(); bool UpdateInput() override;
bool UpdateOutput(); bool UpdateOutput() override;
Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index); Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index);
~Joystick(); ~Joystick();
std::string GetName() const; std::string GetName() const override;
int GetId() const; int GetId() const override;
std::string GetSource() const; std::string GetSource() const override;
private: private:
SDL_Joystick* const m_joystick; SDL_Joystick* const m_joystick;

View File

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

View File

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

View File

@ -97,7 +97,7 @@ private:
class ProgramShaderCacheInserter : public LinearDiskCacheReader<SHADERUID, u8> class ProgramShaderCacheInserter : public LinearDiskCacheReader<SHADERUID, u8>
{ {
public: 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; static PCache pshaders;

View File

@ -46,39 +46,39 @@ public:
static void Init(); static void Init();
static void Shutdown(); static void Shutdown();
void SetColorMask(); void SetColorMask() override;
void SetBlendMode(bool forceUpdate); void SetBlendMode(bool forceUpdate) override;
void SetScissorRect(const TargetRectangle& rc); void SetScissorRect(const TargetRectangle& rc) override;
void SetGenerationMode(); void SetGenerationMode() override;
void SetDepthMode(); void SetDepthMode() override;
void SetLogicOpMode(); void SetLogicOpMode() override;
void SetDitherMode(); void SetDitherMode() override;
void SetLineWidth(); void SetLineWidth() override;
void SetSamplerState(int stage,int texindex); void SetSamplerState(int stage,int texindex) override;
void SetInterlacingMode(); void SetInterlacingMode() override;
// TODO: Implement and use these // TODO: Implement and use these
void ApplyState(bool bUseDstAlpha) {} void ApplyState(bool bUseDstAlpha) override {}
void RestoreState() {} 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(); void DrawDebugInfo();
static void FlipImageData(u8 *data, int w, int h); 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 ResetAPIState() override;
void RestoreAPIState(); 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); static void TakeScreenshot(const TargetRectangle &rc, std::string filename);

View File

@ -45,23 +45,23 @@ private:
~TCacheEntry(); ~TCacheEntry();
void Load(unsigned int width, unsigned int height, 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, void FromRenderTarget(u32 dstAddr, unsigned int dstFormat,
unsigned int srcFormat, const EFBRectangle& srcRect, unsigned int srcFormat, const EFBRectangle& srcRect,
bool isIntensity, bool scaleByHalf, unsigned int cbufid, 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); bool Save(const char filename[], unsigned int level);
}; };
~TextureCache(); ~TextureCache();
TCacheEntryBase* CreateTexture(unsigned int width, unsigned int height, 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); 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();
~GLVertexFormat(); ~GLVertexFormat();
virtual void Initialize(const PortableVertexDeclaration &_vtx_decl); virtual void Initialize(const PortableVertexDeclaration &_vtx_decl) override;
virtual void SetupVertexPointers(); virtual void SetupVertexPointers() override;
GLuint VAO; GLuint VAO;
}; };
@ -32,9 +32,9 @@ class VertexManager : public ::VertexManager
public: public:
VertexManager(); VertexManager();
~VertexManager(); ~VertexManager();
NativeVertexFormat* CreateNativeVertexFormat(); NativeVertexFormat* CreateNativeVertexFormat() override;
void CreateDeviceObjects(); void CreateDeviceObjects() override;
void DestroyDeviceObjects(); void DestroyDeviceObjects() override;
// NativeVertexFormat use this // NativeVertexFormat use this
GLuint m_vertex_buffers; GLuint m_vertex_buffers;
@ -42,7 +42,7 @@ public:
GLuint m_last_vao; GLuint m_last_vao;
private: private:
void Draw(u32 stride); void Draw(u32 stride);
void vFlush(); void vFlush() override;
void PrepareDrawBuffers(u32 stride); void PrepareDrawBuffers(u32 stride);
NativeVertexFormat *m_CurrentVertexFmt; NativeVertexFormat *m_CurrentVertexFmt;
}; };

View File

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

View File

@ -9,57 +9,57 @@ namespace SW
class VideoSoftware : public VideoBackend class VideoSoftware : public VideoBackend
{ {
bool Initialize(void *&); bool Initialize(void *&) override;
void Shutdown(); void Shutdown() override;
std::string GetName(); std::string GetName() override;
void EmuStateChange(EMUSTATE_CHANGE newState); void EmuStateChange(EMUSTATE_CHANGE newState) override;
void RunLoop(bool enable); void RunLoop(bool enable) override;
void ShowConfig(void* parent); void ShowConfig(void* parent) override;
void Video_Prepare(); void Video_Prepare() override;
void Video_Cleanup(); void Video_Cleanup() override;
void Video_EnterLoop(); void Video_EnterLoop() override;
void Video_ExitLoop(); void Video_ExitLoop() override;
void Video_BeginField(u32, u32, u32); void Video_BeginField(u32, u32, u32) override;
void Video_EndField(); void Video_EndField() override;
u32 Video_AccessEFB(EFBAccessType, u32, u32, u32); u32 Video_AccessEFB(EFBAccessType, u32, u32, u32) override;
u32 Video_GetQueryResult(PerfQueryType type); u32 Video_GetQueryResult(PerfQueryType type) override;
void Video_AddMessage(const char* pstr, unsigned int milliseconds); void Video_AddMessage(const char* pstr, unsigned int milliseconds) override;
void Video_ClearMessages(); void Video_ClearMessages() override;
bool Video_Screenshot(const char* filename); bool Video_Screenshot(const char* filename) override;
int Video_LoadTexture(char *imagedata, u32 width, u32 height); int Video_LoadTexture(char *imagedata, u32 width, u32 height);
void Video_DeleteTexture(int texID); void Video_DeleteTexture(int texID);
void Video_DrawTexture(int texID, float *coords); void Video_DrawTexture(int texID, float *coords);
void Video_SetRendering(bool bEnabled); void Video_SetRendering(bool bEnabled) override;
void Video_GatherPipeBursted(); void Video_GatherPipeBursted() override;
bool Video_IsHiWatermarkActive(); bool Video_IsHiWatermarkActive() override;
bool Video_IsPossibleWaitingSetDrawDone(); bool Video_IsPossibleWaitingSetDrawDone() override;
void Video_AbortFrame(); void Video_AbortFrame() override;
readFn16 Video_CPRead16(); readFn16 Video_CPRead16() override;
writeFn16 Video_CPWrite16(); writeFn16 Video_CPWrite16() override;
readFn16 Video_PERead16(); readFn16 Video_PERead16() override;
writeFn16 Video_PEWrite16(); writeFn16 Video_PEWrite16() override;
writeFn32 Video_PEWrite32(); writeFn32 Video_PEWrite32() override;
void UpdateFPSDisplay(const char*); void UpdateFPSDisplay(const char*) override;
unsigned int PeekMessages(); unsigned int PeekMessages() override;
void PauseAndLock(bool doLock, bool unpauseOnUnlock=true); void PauseAndLock(bool doLock, bool unpauseOnUnlock=true) override;
void DoState(PointerWrap &p); void DoState(PointerWrap &p) override;
public: public:
void CheckInvalidState(); void CheckInvalidState() override;
}; };
} }