ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159 from Tilka/misc 

Cleanup stuff
This commit is contained in:
Matthew Parlane 2014-03-17 17:43:20 +13:00
parent d3e9702cec 46becfc06b
commit 6445e02d53
36 changed files with 249 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,7 +5,7 @@ Thumbs.db
# Ignore autogenerated source files
Source/Core/Common/scmrev.h
# Ignore files output by build
/[Bb]uild[-_]*/
/[Bb]uild*/
/[Bb]inary/
/obj/
# Ignore various files created by visual studio/msbuild

18
Source/Core/Common/IniFile.cpp
View File

@ -114,7 +114,7 @@ bool IniFile::Section::Get(const std::string& key, std::string* value, const std
return false;
}
bool IniFile::Section::Get(const std::string& key, std::vector<std::string>& out)
bool IniFile::Section::Get(const std::string& key, std::vector<std::string>* out)
{
std::string temp;
bool retval = Get(key, &temp);
@ -132,7 +132,7 @@ bool IniFile::Section::Get(const std::string& key, std::vector<std::string>& out
size_t subEnd = temp.find_first_of(",", subStart);
if (subStart != subEnd)
// take from first char until next ,
out.push_back(StripSpaces(temp.substr(subStart, subEnd - subStart)));
out->push_back(StripSpaces(temp.substr(subStart, subEnd - subStart)));
// Find the next non , char
subStart = temp.find_first_not_of(",", subEnd);
}
@ -273,23 +273,25 @@ bool IniFile::DeleteKey(const std::string& sectionName, const std::string& key)
}
// Return a list of all keys in a section
bool IniFile::GetKeys(const std::string& sectionName, std::vector<std::string>& keys) const
bool IniFile::GetKeys(const std::string& sectionName, std::vector<std::string>* keys) const
{
const Section* section = GetSection(sectionName);
if (!section)
{
return false;
keys = section->keys_order;
}
*keys = section->keys_order;
return true;
}
// Return a list of all lines in a section
bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>& lines, const bool remove_comments) const
bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>* lines, const bool remove_comments) const
{
const Section* section = GetSection(sectionName);
if (!section)
return false;
lines.clear();
lines->clear();
for (std::string line : section->lines)
{
line = StripSpaces(line);
@ -308,7 +310,7 @@ bool IniFile::GetLines(const std::string& sectionName, std::vector<std::string>&
}
}
lines.push_back(line);
lines->push_back(line);
}
return true;
@ -426,7 +428,7 @@ bool IniFile::Save(const std::string& filename)
return File::RenameSync(temp, filename);
}
bool IniFile::Get(const std::string& sectionName, const std::string& key, std::vector<std::string>& values)
bool IniFile::Get(const std::string& sectionName, const std::string& key, std::vector<std::string>* values)
{
Section *section = GetSection(sectionName);
if (!section)

8
Source/Core/Common/IniFile.h
View File

@ -66,7 +66,7 @@ public:
bool Get(const std::string& key, bool* value, bool defaultValue = false);
bool Get(const std::string& key, float* value, float defaultValue = false);
bool Get(const std::string& key, double* value, double defaultValue = false);
bool Get(const std::string& key, std::vector<std::string>& values);
bool Get(const std::string& key, std::vector<std::string>* values);
bool operator < (const Section& other) const {
return name < other.name;
@ -116,7 +116,7 @@ public:
bool Get(const std::string& sectionName, const std::string& key, int* value, int defaultValue = 0);
bool Get(const std::string& sectionName, const std::string& key, u32* value, u32 defaultValue = 0);
bool Get(const std::string& sectionName, const std::string& key, bool* value, bool defaultValue = false);
bool Get(const std::string& sectionName, const std::string& key, std::vector<std::string>& values);
bool Get(const std::string& sectionName, const std::string& key, std::vector<std::string>* values);
bool Get(const std::string& sectionName, const std::string& key, std::string* value, const std::string& defaultValue = NULL_STRING);
template<typename T> bool GetIfExists(const std::string& sectionName, const std::string& key, T value)
@ -126,10 +126,10 @@ public:
return false;
}
bool GetKeys(const std::string& sectionName, std::vector<std::string>& keys) const;
bool GetKeys(const std::string& sectionName, std::vector<std::string>* keys) const;
void SetLines(const std::string& sectionName, const std::vector<std::string>& lines);
bool GetLines(const std::string& sectionName, std::vector<std::string>& lines, const bool remove_comments = true) const;
bool GetLines(const std::string& sectionName, std::vector<std::string>* lines, const bool remove_comments = true) const;
bool DeleteKey(const std::string& sectionName, const std::string& key);
bool DeleteSection(const std::string& sectionName);

19
Source/Core/Core/ActionReplay.cpp
View File

@ -123,8 +123,8 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, bool forceLoad
std::vector<std::string> enabledLines;
std::set<std::string> enabledNames;
localIni.GetLines("ActionReplay_Enabled", enabledLines);
for (auto& line : enabledLines)
localIni.GetLines("ActionReplay_Enabled", &enabledLines);
for (const std::string& line : enabledLines)
{
if (line.size() != 0 && line[0] == '$')
{
@ -140,12 +140,14 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, bool forceLoad
std::vector<std::string> encryptedLines;
ARCode currentCode;
ini->GetLines("ActionReplay", lines);
ini->GetLines("ActionReplay", &lines);
for (std::string line : lines)
for (const std::string& line : lines)
{
if (line.empty())
{
continue;
}
std::vector<std::string> pieces;
@ -283,13 +285,10 @@ bool RunCode(const ARCode &arcode)
LogInfo("Code Name: %s", arcode.name.c_str());
LogInfo("Number of codes: %i", arcode.ops.size());
std::vector<AREntry>::const_iterator
iter = arcode.ops.begin(),
ops_end = arcode.ops.end();
for (; iter != ops_end; ++iter)
for (const AREntry& entry : arcode.ops)
{
const ARAddr& addr = *(ARAddr*)&iter->cmd_addr;
const u32 data = iter->value;
const ARAddr& addr = *(ARAddr*)&entry.cmd_addr;
const u32 data = entry.value;
// after a conditional code, skip lines if needed
if (skip_count)

14
Source/Core/Core/GeckoCodeConfig.cpp
View File

@ -20,7 +20,7 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, std::vector<Ge
for (const IniFile* ini : inis)
{
std::vector<std::string> lines;
ini->GetLines("Gecko", lines, false);
ini->GetLines("Gecko", &lines, false);
GeckoCode gcode;
@ -72,23 +72,29 @@ void LoadCodes(const IniFile& globalIni, const IniFile& localIni, std::vector<Ge
// add the last code
if (gcode.name.size())
{
gcodes.push_back(gcode);
}
ini->GetLines("Gecko_Enabled", lines, false);
ini->GetLines("Gecko_Enabled", &lines, false);
for (auto line : lines)
for (const std::string& line : lines)
{
if (line.size() == 0 || line[0] != '$')
{
continue;
}
std::string name = line.substr(1);
for (auto& ogcode : gcodes)
for (GeckoCode& ogcode : gcodes)
{
if (ogcode.name == name)
{
ogcode.enabled = true;
}
}
}
}
}
// used by the SaveGeckoCodes function
void SaveGeckoCode(std::vector<std::string>& lines, std::vector<std::string>& enabledLines, const GeckoCode& gcode)

1
Source/Core/Core/HW/DSPHLE/UCodes/UCode_AX.cpp
View File

@ -669,7 +669,6 @@ void CUCode_AX::HandleMail(u32 mail)
{
CopyCmdList(mail, cmdlist_size);
StartWorking();
NotifyAXThread();
}
else if (m_UploadSetupInProgress)
{

11
Source/Core/Core/HW/DSPHLE/UCodes/UCode_ROM.cpp
View File

@ -57,10 +57,6 @@ void CUCode_Rom::HandleMail(u32 _uMail)
m_CurrentUCode.m_Length = _uMail & 0xffff;
break;
case 0x80F3C002:
m_CurrentUCode.m_IMEMAddress = _uMail & 0xffff;
break;
case 0x80F3B002:
m_CurrentUCode.m_DMEMLength = _uMail & 0xffff;
if (m_CurrentUCode.m_DMEMLength) {
@ -68,13 +64,14 @@ void CUCode_Rom::HandleMail(u32 _uMail)
}
break;
case 0x80F3C002:
m_CurrentUCode.m_IMEMAddress = _uMail & 0xffff;
break;
case 0x80F3D001:
{
m_CurrentUCode.m_StartPC = _uMail & 0xffff;
BootUCode();
return; // Important! BootUCode indirectly does "delete this;". Must exit immediately.
}
break;
default:
break;

6
Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp
View File

@ -58,7 +58,7 @@ CUCode_Zelda::CUCode_Zelda(DSPHLE *dsp_hle, u32 _CRC)
if (IsLightVersion())
{
NOTICE_LOG(DSPHLE, "Luigi Stylee!");
DEBUG_LOG(DSPHLE, "Luigi Stylee!");
m_rMailHandler.PushMail(0x88881111);
}
else
@ -92,9 +92,9 @@ CUCode_Zelda::~CUCode_Zelda()
u8 *CUCode_Zelda::GetARAMPointer(u32 address)
{
if (IsDMAVersion())
return (u8 *)(Memory::GetPointer(m_DMABaseAddr)) + address;
return Memory::GetPointer(m_DMABaseAddr) + address;
else
return (u8 *)(DSP::GetARAMPtr()) + address;
return DSP::GetARAMPtr() + address;
}
void CUCode_Zelda::Update(int cycles)

9
Source/Core/Core/HW/Wiimote.cpp
View File

@ -24,11 +24,10 @@ InputPlugin *GetPlugin()
void Shutdown()
{
std::vector<ControllerEmu*>::const_iterator
i = g_plugin.controllers.begin(),
e = g_plugin.controllers.end();
for ( ; i!=e; ++i )
delete *i;
for (const ControllerEmu* i : g_plugin.controllers)
{
delete i;
}
g_plugin.controllers.clear();
WiimoteReal::Stop();

4
Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.cpp
View File

@ -130,7 +130,7 @@ void Nunchuk::GetState(u8* const data, const bool focus)
{
u8 mask;
float x, y;
m_udpWrap->inst->getNunchuck(x, y, mask);
m_udpWrap->inst->getNunchuck(&x, &y, &mask);
// buttons
if (mask & UDPWM_NC)
ncdata->bt &= ~WiimoteEmu::Nunchuk::BUTTON_C;
@ -146,7 +146,7 @@ void Nunchuk::GetState(u8* const data, const bool focus)
if (m_udpWrap->updNunAccel)
{
float x, y, z;
m_udpWrap->inst->getNunchuckAccel(x, y, z);
m_udpWrap->inst->getNunchuckAccel(&x, &y, &z);
accel.x = x;
accel.y = y;
accel.z = z;

4
Source/Core/Core/HW/WiimoteEmu/UDPTLayer.h
View File

@ -34,7 +34,7 @@ namespace UDPTLayer
if (!(m->inst)) return;
if (!(m->updAccel)) return;
float x, y, z;
m->inst->getAccel(x, y, z);
m->inst->getAccel(&x, &y, &z);
data->x = x;
data->y = y;
data->z = z;
@ -46,7 +46,7 @@ namespace UDPTLayer
if (!(m->updIR)) return;
if ((*x >= -0.999) && (*x <= 0.999) && (*y >= -0.999) && (*y <= 0.999)) return; //the received values are used ONLY when the normal pointer is offscreen
float _x, _y;
m->inst->getIR(_x, _y);
m->inst->getIR(&_x, &_y);
*x = _x * 2 - 1;
*y = -(_y * 2 - 1);
*z = 0;

33
Source/Core/Core/PatchEngine.cpp
View File

@ -53,7 +53,7 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
std::string enabledSectionName = section + "_Enabled";
std::vector<std::string> enabledLines;
std::set<std::string> enabledNames;
localIni.GetLines(enabledSectionName, enabledLines);
localIni.GetLines(enabledSectionName, &enabledLines);
for (const std::string& line : enabledLines)
{
if (line.size() != 0 && line[0] == '$')
@ -69,7 +69,7 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
{
std::vector<std::string> lines;
Patch currentPatch;
ini->GetLines(section, lines);
ini->GetLines(section, &lines);
for (std::string& line : lines)
{
@ -80,7 +80,9 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
{
// Take care of the previous code
if (currentPatch.name.size())
{
patches.push_back(currentPatch);
}
currentPatch.entries.clear();
// Set active and name
@ -93,7 +95,9 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
std::string::size_type loc = line.find_first_of('=', 0);
if (loc != std::string::npos)
{
line[loc] = ':';
}
std::vector<std::string> items;
SplitString(line, ':', items);
@ -108,33 +112,41 @@ void LoadPatchSection(const std::string& section, std::vector<Patch>& patches, I
pE.type = PatchType(std::find(PatchTypeStrings, PatchTypeStrings + 3, items[1]) - PatchTypeStrings);
success &= (pE.type != (PatchType)3);
if (success)
{
currentPatch.entries.push_back(pE);
}
}
}
}
if (currentPatch.name.size() && currentPatch.entries.size())
{
patches.push_back(currentPatch);
}
}
}
static void LoadDiscList(const char *section, std::vector<std::string> &_discList, IniFile &ini)
static void LoadDiscList(const std::string& section, IniFile& ini)
{
std::vector<std::string> lines;
if (!ini.GetLines(section, lines))
if (!ini.GetLines(section, &lines))
{
return;
}
for (const std::string& line : lines)
{
if (!line.empty())
_discList.push_back(line);
{
discList.push_back(line);
}
}
}
static void LoadSpeedhacks(const char *section, std::map<u32, int> &hacks, IniFile &ini)
static void LoadSpeedhacks(const std::string& section, IniFile& ini)
{
std::vector<std::string> keys;
ini.GetKeys(section, keys);
ini.GetKeys(section, &keys);
for (const std::string& key : keys)
{
std::string value;
@ -146,7 +158,8 @@ static void LoadSpeedhacks(const char *section, std::map<u32, int> &hacks, IniFi
bool success = true;
success &= TryParse(key, &address);
success &= TryParse(value, &cycles);
if (success) {
if (success)
{
speedHacks[address] = (int)cycles;
}
}
@ -176,8 +189,8 @@ void LoadPatches()
Gecko::LoadCodes(globalIni, localIni, gcodes);
Gecko::SetActiveCodes(gcodes);
LoadSpeedhacks("Speedhacks", speedHacks, merged);
LoadDiscList("DiscList", discList, merged);
LoadSpeedhacks("Speedhacks", merged);
LoadDiscList("DiscList", merged);
}
void ApplyPatches(const std::vector<Patch> &patches)

33
Source/Core/Core/PowerPC/Interpreter/Interpreter.h
View File

@ -206,7 +206,6 @@ public:
static void stwcxd(UGeckoInstruction _inst);
static void stwux(UGeckoInstruction _inst);
static void stwx(UGeckoInstruction _inst);
static void sync(UGeckoInstruction _inst);
static void tlbia(UGeckoInstruction _inst);
static void tlbie(UGeckoInstruction _inst);
static void tlbsync(UGeckoInstruction _inst);
@ -281,21 +280,33 @@ public:
static void mcrf(UGeckoInstruction _inst);
static void rfi(UGeckoInstruction _inst);
static void rfid(UGeckoInstruction _inst);
// static void sync(UGeckoInstruction _inst);
static void sync(UGeckoInstruction _inst);
static void isync(UGeckoInstruction _inst);
static _interpreterInstruction m_opTable[64];
static _interpreterInstruction m_opTable4[1024];
static _interpreterInstruction m_opTable19[1024];
static _interpreterInstruction m_opTable31[1024];
static _interpreterInstruction m_opTable59[32];
static _interpreterInstruction m_opTable63[1024];
// singleton
static Interpreter* getInstance();
static void RunTable4(UGeckoInstruction _instCode);
static void RunTable19(UGeckoInstruction _instCode);
static void RunTable31(UGeckoInstruction _instCode);
static void RunTable59(UGeckoInstruction _instCode);
static void RunTable63(UGeckoInstruction _instCode);
static u32 Helper_Carry(u32 _uValue1, u32 _uValue2);
private:
// flag helper
static void Helper_UpdateCR0(u32 _uValue);
static void Helper_UpdateCR1(double _fValue);
static void Helper_UpdateCR1(float _fValue);
static void Helper_UpdateCRx(int _x, u32 _uValue);
static u32 Helper_Carry(u32 _uValue1, u32 _uValue2);
// address helper
static u32 Helper_Get_EA (const UGeckoInstruction _inst);
@ -310,22 +321,6 @@ public:
// other helper
static u32 Helper_Mask(int mb, int me);
static _interpreterInstruction m_opTable[64];
static _interpreterInstruction m_opTable4[1024];
static _interpreterInstruction m_opTable19[1024];
static _interpreterInstruction m_opTable31[1024];
static _interpreterInstruction m_opTable59[32];
static _interpreterInstruction m_opTable63[1024];
// singleton
static Interpreter *getInstance();
private:
Interpreter() { }
~Interpreter() { }
Interpreter(const Interpreter &);
Interpreter & operator=(const Interpreter &);
static void Helper_FloatCompareOrdered(UGeckoInstruction _inst, double a, double b);
static void Helper_FloatCompareUnordered(UGeckoInstruction _inst, double a, double b);

9
Source/Core/DolphinWX/CheatsWindow.cpp
View File

@ -547,12 +547,9 @@ void CheatSearchTab::UpdateCheatSearchResultsList()
}
else
{
std::vector<CheatSearchResult>::const_iterator
i = search_results.begin(),
e = search_results.end();
for (; i!=e; ++i)
for (const CheatSearchResult& result : search_results)
{
u32 display_value = i->old_value;
u32 display_value = result.old_value;
// #ifdef LIL_ENDIAN :p
switch (search_type_size)
@ -574,7 +571,7 @@ void CheatSearchTab::UpdateCheatSearchResultsList()
rowfmt[14] = (wxChar)(wxT('0') + search_type_size*2);
lbox_search_results->Append(
wxString::Format(rowfmt, i->address, display_value, display_value, display_value));
wxString::Format(rowfmt, result.address, display_value, display_value, display_value));
}
}

11
Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp
View File

@ -195,12 +195,19 @@ void CBreakPointWindow::LoadAll(wxCommandEvent& WXUNUSED(event))
MemChecks::TMemChecksStr newmcs;
if (!ini.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX)))
{
return;
}
if (ini.GetLines("BreakPoints", newbps, false))
if (ini.GetLines("BreakPoints", &newbps, false))
{
PowerPC::breakpoints.AddFromStrings(newbps);
if (ini.GetLines("MemoryChecks", newmcs, false))
}
if (ini.GetLines("MemoryChecks", &newmcs, false))
{
PowerPC::memchecks.AddFromStrings(newmcs);
}
NotifyUpdate();
}

2
Source/Core/DolphinWX/FrameAui.cpp
View File

@ -851,7 +851,9 @@ void CFrame::LoadIniPerspectives()
// Don't save a blank perspective
if (Tmp.Name.empty())
{
continue;
}
_Section = StringFromFormat("P - %s", Tmp.Name.c_str());
ini.Get(_Section, "Perspective", &_Perspective,

38
Source/Core/DolphinWX/GeckoCodeDiag.cpp
View File

@ -88,15 +88,14 @@ void CodeConfigPanel::UpdateCodeList(bool checkRunning)
m_listbox_gcodes->Clear();
// add the codes to the listbox
std::vector<GeckoCode>::const_iterator
gcodes_iter = m_gcodes.begin(),
gcodes_end = m_gcodes.end();
for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
for (const GeckoCode& code : m_gcodes)
{
m_listbox_gcodes->Append(StrToWxStr(code.name));
if (code.enabled)
{
m_listbox_gcodes->Append(StrToWxStr(gcodes_iter->name));
if (gcodes_iter->enabled)
m_listbox_gcodes->Check(m_listbox_gcodes->GetCount()-1, true);
}
}
wxCommandEvent evt;
UpdateInfoBox(evt);
@ -131,21 +130,19 @@ void CodeConfigPanel::UpdateInfoBox(wxCommandEvent&)
// notes textctrl
m_infobox.textctrl_notes->Clear();
std::vector<std::string>::const_iterator
notes_iter = m_gcodes[sel].notes.begin(),
notes_end = m_gcodes[sel].notes.end();
for (; notes_iter!=notes_end; ++notes_iter)
m_infobox.textctrl_notes->AppendText(StrToWxStr(*notes_iter));
for (const std::string& note : m_gcodes[sel].notes)
{
m_infobox.textctrl_notes->AppendText(StrToWxStr(note));
}
m_infobox.textctrl_notes->ScrollLines(-99); // silly
m_infobox.label_creator->SetLabel(wxGetTranslation(wxstr_creator) + StrToWxStr(m_gcodes[sel].creator));
// add codes to info listbox
std::vector<GeckoCode::Code>::const_iterator
codes_iter = m_gcodes[sel].codes.begin(),
codes_end = m_gcodes[sel].codes.end();
for (; codes_iter!=codes_end; ++codes_iter)
m_infobox.listbox_codes->Append(wxString::Format(wxT("%08X %08X"), codes_iter->address, codes_iter->data));
for (const GeckoCode::Code& code : m_gcodes[sel].codes)
{
m_infobox.listbox_codes->Append(wxString::Format(wxT("%08X %08X"), code.address, code.data));
}
}
else
{
@ -281,10 +278,7 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&)
unsigned long added_count = 0;
// append the codes to the code list
std::vector<GeckoCode>::const_iterator
gcodes_iter = gcodes.begin(),
gcodes_end = gcodes.end();
for (; gcodes_iter!= gcodes_end; ++gcodes_iter)
for (const GeckoCode& code : gcodes)
{
// only add codes which do not already exist
std::vector<GeckoCode>::const_iterator
@ -294,13 +288,13 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&)
{
if (existing_gcodes_end == existing_gcodes_iter)
{
m_gcodes.push_back(*gcodes_iter);
m_gcodes.push_back(code);
++added_count;
break;
}
// code exists
if (existing_gcodes_iter->Compare(*gcodes_iter))
if (existing_gcodes_iter->Compare(code))
break;
}
}

36
Source/Core/DolphinWX/VideoConfigDiag.cpp
View File

@ -235,11 +235,10 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
choice_backend = new wxChoice(page_general, wxID_ANY);
RegisterControl(choice_backend, wxGetTranslation(backend_desc));
std::vector<VideoBackend*>::const_iterator
it = g_available_video_backends.begin(),
itend = g_available_video_backends.end();
for (; it != itend; ++it)
choice_backend->AppendString(wxGetTranslation(StrToWxStr((*it)->GetDisplayName())));
for (const VideoBackend* backend : g_available_video_backends)
{
choice_backend->AppendString(wxGetTranslation(StrToWxStr(backend->GetDisplayName())));
}
choice_backend->SetStringSelection(wxGetTranslation(StrToWxStr(g_video_backend->GetDisplayName())));
choice_backend->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &VideoConfigDiag::Event_Backend, this);
@ -259,11 +258,10 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
{
wxChoice* const choice_adapter = CreateChoice(page_general, vconfig.iAdapter, wxGetTranslation(adapter_desc));
std::vector<std::string>::const_iterator
it = vconfig.backend_info.Adapters.begin(),
itend = vconfig.backend_info.Adapters.end();
for (; it != itend; ++it)
choice_adapter->AppendString(StrToWxStr(*it));
for (const std::string& adapter : vconfig.backend_info.Adapters)
{
choice_adapter->AppendString(StrToWxStr(adapter));
}
choice_adapter->Select(vconfig.iAdapter);
@ -381,11 +379,10 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
text_aamode = new wxStaticText(page_enh, -1, _("Anti-Aliasing:"));
choice_aamode = CreateChoice(page_enh, vconfig.iMultisampleMode, wxGetTranslation(aa_desc));
std::vector<std::string>::const_iterator
it = vconfig.backend_info.AAModes.begin(),
itend = vconfig.backend_info.AAModes.end();
for (; it != itend; ++it)
choice_aamode->AppendString(wxGetTranslation(StrToWxStr(*it)));
for (const std::string& mode : vconfig.backend_info.AAModes)
{
choice_aamode->AppendString(wxGetTranslation(StrToWxStr(mode)));
}
choice_aamode->Select(vconfig.iMultisampleMode);
szr_enh->Add(text_aamode, 1, wxALIGN_CENTER_VERTICAL, 0);
@ -406,11 +403,10 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
RegisterControl(choice_ppshader, wxGetTranslation(ppshader_desc));
choice_ppshader->AppendString(_("(off)"));
std::vector<std::string>::const_iterator
it = vconfig.backend_info.PPShaders.begin(),
itend = vconfig.backend_info.PPShaders.end();
for (; it != itend; ++it)
choice_ppshader->AppendString(StrToWxStr(*it));
for (const std::string& shader : vconfig.backend_info.PPShaders)
{
choice_ppshader->AppendString(StrToWxStr(shader));
}
if (vconfig.sPostProcessingShader.empty())
choice_ppshader->Select(0);

46
Source/Core/InputCommon/UDPWiimote.cpp
View File

@ -65,9 +65,9 @@ struct UDPWiimote::_d
int UDPWiimote::noinst = 0;
UDPWiimote::UDPWiimote(const std::string& _port, const std::string& name, int _index) :
port(_port), displayName(name),
d(new _d) ,x(0), y(0), z(1.0f), naX(0), naY(0), naZ(-1.0f), nunX(0), nunY(0),
pointerX(1001.0f / 2), pointerY(0), nunMask(0), mask(0), index(_index), int_port(atoi(_port.c_str()))
port(_port), displayName(name), d(new _d),
waX(0), waY(0), waZ(1), naX(0), naY(0), naZ(-1), nunX(0), nunY(0),
pointerX(1001.0f / 2), pointerY(0), nunMask(0), wiimoteMask(0), index(_index), int_port(atoi(_port.c_str()))
{
static bool sranded=false;
@ -275,9 +275,9 @@ int UDPWiimote::pharsePacket(u8 * bf, size_t size)
ux=(double)((s32)ntohl(*p)); p++;
uy=(double)((s32)ntohl(*p)); p++;
uz=(double)((s32)ntohl(*p)); p++;
x=ux/1048576; //packet accel data
y=uy/1048576;
z=uz/1048576;
waX=ux/1048576; //packet accel data
waY=uy/1048576;
waZ=uz/1048576;
}
if (bf[2] & BUTT_FLAG)
@ -285,7 +285,7 @@ int UDPWiimote::pharsePacket(u8 * bf, size_t size)
if ((size-(((u8*)p)-bf)) < 4)
return -1;
mask=ntohl(*p); p++;
wiimoteMask = ntohl(*p); p++;
}
if (bf[2] & IR_FLAG)
@ -388,43 +388,43 @@ void UDPWiimote::broadcastPresence()
broadcastIPv6(bf,7+slen);
}
void UDPWiimote::getAccel(float &_x, float &_y, float &_z)
void UDPWiimote::getAccel(float* x, float* y, float* z)
{
std::lock_guard<std::mutex> lk(d->mutex);
_x=(float)x;
_y=(float)y;
_z=(float)z;
*x = (float)waX;
*y = (float)waY;
*z = (float)waZ;
}
u32 UDPWiimote::getButtons()
{
u32 msk;
std::lock_guard<std::mutex> lk(d->mutex);
msk=mask;
msk = wiimoteMask;
return msk;
}
void UDPWiimote::getIR(float& _x, float& _y)
void UDPWiimote::getIR(float* x, float* y)
{
std::lock_guard<std::mutex> lk(d->mutex);
_x=(float)pointerX;
_y=(float)pointerY;
*x = (float)pointerX;
*y = (float)pointerY;
}
void UDPWiimote::getNunchuck(float &_x, float &_y, u8 &_mask)
void UDPWiimote::getNunchuck(float* x, float* y, u8* mask)
{
std::lock_guard<std::mutex> lk(d->mutex);
_x=(float)nunX;
_y=(float)nunY;
_mask=nunMask;
*x = (float)nunX;
*y = (float)nunY;
*mask = nunMask;
}
void UDPWiimote::getNunchuckAccel(float& _x, float& _y, float& _z)
void UDPWiimote::getNunchuckAccel(float* x, float* y, float* z)
{
std::lock_guard<std::mutex> lk(d->mutex);
_x = (float)naX;
_y = (float)naY;
_z = (float)naZ;
*x = (float)naX;
*y = (float)naY;
*z = (float)naZ;
}
const std::string& UDPWiimote::getPort()

17
Source/Core/InputCommon/UDPWiimote.h
View File

@ -27,12 +27,15 @@ class UDPWiimote
public:
UDPWiimote(const std::string& port, const std::string& name, int index);
virtual ~UDPWiimote();
void getAccel(float& x, float& y, float& z);
void getAccel(float* x, float* y, float* z);
u32 getButtons();
void getNunchuck(float& x, float& y, u8& mask);
void getIR(float& x, float& y);
void getNunchuckAccel(float& x, float& y, float& z);
int getErrNo() { return err; }
void getNunchuck(float* x, float* y, u8* mask);
void getIR(float* x, float* y);
void getNunchuckAccel(float* x, float* y, float* z);
int getErrNo()
{
return err;
}
const std::string& getPort();
void changeName(const std::string& name);
@ -42,12 +45,12 @@ private:
int pharsePacket(u8* data, size_t size);
struct _d; //using pimpl because Winsock2.h doesn't have include guards -_-
_d* d;
double x,y,z;
double waX, waY, waZ;
double naX, naY, naZ;
double nunX, nunY;
double pointerX, pointerY;
u8 nunMask;
u32 mask;
u32 wiimoteMask;
u16 bcastMagic;
int err;
int index;

12
Source/Core/VideoBackends/D3D/FramebufferManager.h
View File

@ -49,9 +49,9 @@ struct XFBSource : public XFBSourceBase
~XFBSource() { tex->Release(); }
void Draw(const MathUtil::Rectangle<int> &sourcerc,
const MathUtil::Rectangle<float> &drawrc) const;
void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
void CopyEFB(float Gamma);
const MathUtil::Rectangle<float> &drawrc) const override;
void DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) override;
void CopyEFB(float Gamma) override;
D3DTexture2D* const tex;
};
@ -81,10 +81,10 @@ public:
}
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 struct Efb
{

12
Source/Core/VideoBackends/D3D/PerfQuery.h
View File

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

44
Source/Core/VideoBackends/D3D/Render.h
View File

@ -12,41 +12,41 @@ public:
Renderer();
~Renderer();
void SetColorMask();
void SetBlendMode(bool forceUpdate);
void SetScissorRect(const EFBRectangle& rc);
void SetGenerationMode();
void SetDepthMode();
void SetLogicOpMode();
void SetDitherMode();
void SetLineWidth();
void SetSamplerState(int stage,int texindex);
void SetInterlacingMode();
void SetViewport();
void SetColorMask() override;
void SetBlendMode(bool forceUpdate) override;
void SetScissorRect(const EFBRectangle& 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;
void SetViewport() override;
// TODO: Fix confusing names (see ResetAPIState and RestoreAPIState)
void ApplyState(bool bUseDstAlpha);
void RestoreState();
void ApplyState(bool bUseDstAlpha) override;
void RestoreState() override;
void ApplyCullDisable();
void RestoreCull();
void RenderText(const std::string& text, int left, int top, u32 color);
void RenderText(const std::string& text, int left, int top, u32 color) override;
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 SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& rc,float Gamma);
void SwapImpl(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;
bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc);
bool SaveScreenshot(const std::string &filename, const TargetRectangle &rc) override;
static bool CheckForResize();
};

12
Source/Core/VideoBackends/D3D/TextureCache.h
View File

@ -27,21 +27,21 @@ private:
~TCacheEntry();
void Load(unsigned int width, unsigned int height,
unsigned int expanded_width, unsigned int levels);
unsigned int expanded_width, unsigned int levels) 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);
bool Save(const std::string& filename, unsigned int level);
void Bind(unsigned int stage) override;
bool Save(const std::string& filename, unsigned int level) override;
};
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;
u64 EncodeToRamFromTexture(u32 address, void* source_texture, u32 SourceW, u32 SourceH, bool bFromZBuffer, bool bIsIntensityFmt, u32 copyfmt, int bScaleByHalf, const EFBRectangle& source) {return 0;};
};

10
Source/Core/VideoBackends/D3D/VertexManager.h
View File

@ -17,12 +17,12 @@ public:
VertexManager();
~VertexManager();
NativeVertexFormat* CreateNativeVertexFormat();
void CreateDeviceObjects();
void DestroyDeviceObjects();
NativeVertexFormat* CreateNativeVertexFormat() override;
void CreateDeviceObjects() override;
void DestroyDeviceObjects() override;
protected:
virtual void ResetBuffer(u32 stride);
virtual void ResetBuffer(u32 stride) override;
u16* GetIndexBuffer() { return &LocalIBuffer[0]; }
private:
@ -30,7 +30,7 @@ private:
void PrepareDrawBuffers();
void Draw(u32 stride);
// temp
void vFlush(bool useDstAlpha);
void vFlush(bool useDstAlpha) override;
u32 m_vertex_buffer_cursor;
u32 m_vertex_draw_offset;

18
Source/Core/VideoBackends/D3D/VideoBackend.h
View File

@ -8,19 +8,19 @@ namespace DX11
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() const override;
std::string GetDisplayName() const 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 std::string&);
unsigned int PeekMessages();
void UpdateFPSDisplay(const std::string&) override;
unsigned int PeekMessages() override;
};
}

4
Source/Core/VideoBackends/D3D/main.cpp
View File

@ -61,12 +61,12 @@ void VideoBackend::UpdateFPSDisplay(const std::string& text)
EmuWindow::SetWindowText(StringFromFormat("%s | D3D | %s", scm_rev_str, text.c_str()));
}
std::string VideoBackend::GetName()
std::string VideoBackend::GetName() const
{
return "D3D";
}
std::string VideoBackend::GetDisplayName()
std::string VideoBackend::GetDisplayName() const
{
return "Direct3D";
}

4
Source/Core/VideoBackends/OGL/VideoBackend.h
View File

@ -11,8 +11,8 @@ class VideoBackend : public VideoBackendHardware
bool Initialize(void *&) override;
void Shutdown() override;
std::string GetName() override;
std::string GetDisplayName() override;
std::string GetName() const override;
std::string GetDisplayName() const override;
void Video_Prepare() override;
void Video_Cleanup() override;

4
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -92,12 +92,12 @@ Make AA apply instantly during gameplay if possible
namespace OGL
{
std::string VideoBackend::GetName()
std::string VideoBackend::GetName() const
{
return "OGL";
}
std::string VideoBackend::GetDisplayName()
std::string VideoBackend::GetDisplayName() const
{
if (GLInterface != nullptr && GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3)
return "OpenGLES";

2
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -56,7 +56,7 @@ static volatile bool fifoStateRun = false;
static volatile bool emuRunningState = false;
static std::mutex m_csSWVidOccupied;
std::string VideoSoftware::GetName()
std::string VideoSoftware::GetName() const
{
return _trans("Software Renderer");
}

2
Source/Core/VideoBackends/Software/VideoBackend.h
View File

@ -13,7 +13,7 @@ class VideoSoftware : public VideoBackend
bool Initialize(void *&) override;
void Shutdown() override;
std::string GetName() override;
std::string GetName() const override;
void EmuStateChange(EMUSTATE_CHANGE newState) override;

9
Source/Core/VideoBackends/Software/VideoConfigDialog.cpp
View File

@ -47,11 +47,10 @@ VideoConfigDialog::VideoConfigDialog(wxWindow* parent, const std::string& title,
wxStaticText* const label_backend = new wxStaticText(page_general, wxID_ANY, _("Backend:"));
wxChoice* const choice_backend = new wxChoice(page_general, wxID_ANY, wxDefaultPosition);
std::vector<VideoBackend*>::const_iterator
it = g_available_video_backends.begin(),
itend = g_available_video_backends.end();
for (; it != itend; ++it)
choice_backend->AppendString(StrToWxStr((*it)->GetDisplayName()));
for (const VideoBackend* backend : g_available_video_backends)
{
choice_backend->AppendString(StrToWxStr(backend->GetDisplayName()));
}
// TODO: How to get the translated plugin name?
choice_backend->SetStringSelection(StrToWxStr(g_video_backend->GetName()));

4
Source/Core/VideoCommon/VideoBackendBase.h
View File

@ -80,8 +80,8 @@ public:
virtual void Shutdown() = 0;
virtual void RunLoop(bool enable) = 0;
virtual std::string GetName() = 0;
virtual std::string GetDisplayName() { return GetName(); }
virtual std::string GetName() const = 0;
virtual std::string GetDisplayName() const { return GetName(); }
virtual void ShowConfig(void*) {}

6
Source/UnitTests/Common/CommonFuncsTest.cpp
View File

@ -11,8 +11,8 @@ TEST(CommonFuncs, ArraySizeMacro)
char test[4];
u32 test2[42];
EXPECT_EQ(4, ArraySize(test));
EXPECT_EQ(42, ArraySize(test2));
EXPECT_EQ(4u, ArraySize(test));
EXPECT_EQ(42u, ArraySize(test2));
}
TEST(CommonFuncs, RoundUpPow2Macro)
@ -41,6 +41,6 @@ TEST(CommonFuncs, Swap)
{
EXPECT_EQ(0xf0, Common::swap8(0xf0));
EXPECT_EQ(0x1234, Common::swap16(0x3412));
EXPECT_EQ(0x12345678, Common::swap32(0x78563412));
EXPECT_EQ(0x12345678u, Common::swap32(0x78563412));
EXPECT_EQ(0x123456789abcdef0ull, Common::swap64(0xf0debc9a78563412ull));
}

10
Source/UnitTests/Common/FifoQueueTest.cpp
View File

@ -11,22 +11,22 @@ TEST(FifoQueue, Simple)
{
Common::FifoQueue<u32> q;
EXPECT_EQ(0, q.Size());
EXPECT_EQ(0u, q.Size());
EXPECT_TRUE(q.Empty());
q.Push(1);
EXPECT_EQ(1, q.Size());
EXPECT_EQ(1u, q.Size());
EXPECT_FALSE(q.Empty());
u32 v; q.Pop(v);
EXPECT_EQ(1, v);
EXPECT_EQ(0, q.Size());
EXPECT_EQ(1u, v);
EXPECT_EQ(0u, q.Size());
EXPECT_TRUE(q.Empty());
// Test the FIFO order.
for (u32 i = 0; i < 1000; ++i)
q.Push(i);
EXPECT_EQ(1000, q.Size());
EXPECT_EQ(1000u, q.Size());
for (u32 i = 0; i < 1000; ++i)
{
u32 v2; q.Pop(v2);

4
Source/UnitTests/Common/FixedSizeQueueTest.cpp
View File

@ -10,7 +10,7 @@ TEST(FixedSizeQueue, Simple)
{
FixedSizeQueue<int, 5> q;
EXPECT_EQ(0, q.size());
EXPECT_EQ(0u, q.size());
q.push(0);
q.push(1);
@ -29,5 +29,5 @@ TEST(FixedSizeQueue, Simple)
EXPECT_EQ(1003, q.pop_front());
EXPECT_EQ(1004, q.pop_front());
EXPECT_EQ(0, q.size());
EXPECT_EQ(0u, q.size());
}