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

Save sync gpu setting to dtm header.

This commit is contained in:
Rachel Bryk 2013-06-20 06:08:17 -04:00
parent 010165b2c2
commit 716f656d28
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Src/BootManager.cpp
View File

@ -126,6 +126,7 @@ bool BootCore(const std::string& _rFilename)
StartUp.bProgressive = Movie::IsProgressive(); StartUp.bProgressive = Movie::IsProgressive();
StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed(); StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed();
StartUp.iCPUCore = Movie::GetCPUMode(); StartUp.iCPUCore = Movie::GetCPUMode();
StartUp.bSyncGPU = Movie::IsSyncGPU();
if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii) if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii)
{ {
if (File::Exists("Movie.raw")) if (File::Exists("Movie.raw"))

9
Source/Core/Core/Src/Movie.cpp
View File

@ -51,7 +51,7 @@ u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats
u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats
u64 g_recordingStartTime; // seconds since 1970 that recording started u64 g_recordingStartTime; // seconds since 1970 that recording started
bool bSaveConfig, bSkipIdle, bDualCore, bProgressive, bDSPHLE, bFastDiscSpeed = false; bool bSaveConfig, bSkipIdle, bDualCore, bProgressive, bDSPHLE, bFastDiscSpeed = false;
bool bMemcard, g_bClearSave = false; bool bMemcard, g_bClearSave, bSyncGPU = false;
std::string videoBackend = "unknown"; std::string videoBackend = "unknown";
int iCPUCore = 1; int iCPUCore = 1;
bool g_bDiscChange = false; bool g_bDiscChange = false;
@ -353,6 +353,10 @@ bool IsUsingMemcard()
{ {
return bMemcard; return bMemcard;
} }
bool IsSyncGPU()
{
return bSyncGPU;
}
void ChangePads(bool instantly) void ChangePads(bool instantly)
{ {
@ -675,6 +679,7 @@ void ReadHeader()
g_bClearSave = tmpHeader.bClearSave; g_bClearSave = tmpHeader.bClearSave;
bMemcard = tmpHeader.bMemcard; bMemcard = tmpHeader.bMemcard;
bongos = tmpHeader.bongos; bongos = tmpHeader.bongos;
bSyncGPU = tmpHeader.bSyncGPU;
memcpy(revision, tmpHeader.revision, ARRAYSIZE(revision)); memcpy(revision, tmpHeader.revision, ARRAYSIZE(revision));
} }
else else
@ -1111,6 +1116,7 @@ void SaveRecording(const char *filename)
header.bUseRealXFB = g_ActiveConfig.bUseRealXFB; header.bUseRealXFB = g_ActiveConfig.bUseRealXFB;
header.bMemcard = bMemcard; header.bMemcard = bMemcard;
header.bClearSave = g_bClearSave; header.bClearSave = g_bClearSave;
header.bSyncGPU = bSyncGPU;
strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange)); strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange));
strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author)); strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author));
memcpy(header.md5,MD5,16); memcpy(header.md5,MD5,16);
@ -1169,6 +1175,7 @@ void GetSettings()
bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE; bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE;
bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed; bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed;
videoBackend = g_video_backend->GetName(); videoBackend = g_video_backend->GetName();
bSyncGPU = SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU;
iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore; iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore;
if (!Core::g_CoreStartupParameter.bWii) if (!Core::g_CoreStartupParameter.bWii)
g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA); g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);

4
Source/Core/Core/Src/Movie.h
View File

@ -106,7 +106,8 @@ struct DTMHeader {
bool bMemcard; bool bMemcard;
bool bClearSave; // Create a new memory card when playing back a movie if true bool bClearSave; // Create a new memory card when playing back a movie if true
u8 bongos; u8 bongos;
u8 reserved[15]; // Padding for any new config options bool bSyncGPU;
u8 reserved[14]; // Padding for any new config options
u8 discChange[40]; // Name of iso file to switch to, for two disc games. u8 discChange[40]; // Name of iso file to switch to, for two disc games.
u8 revision[20]; // Git hash u8 revision[20]; // Git hash
u8 reserved2[27]; // Make heading 256 bytes, just because we can u8 reserved2[27]; // Make heading 256 bytes, just because we can
@ -138,6 +139,7 @@ bool IsFastDiscSpeed();
int GetCPUMode(); int GetCPUMode();
bool IsStartingFromClearSave(); bool IsStartingFromClearSave();
bool IsUsingMemcard(); bool IsUsingMemcard();
bool IsSyncGPU();
void SetGraphicsConfig(); void SetGraphicsConfig();
void GetSettings(); void GetSettings();