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 #7569 from Techjar/sync-deferred-efb 

NetPlay: Sync Defer EFB Copies setting
This commit is contained in:
Pierre Bourdon 2018-11-13 03:09:25 +01:00 committed by GitHub
parent 97e3200f57 caf2fc3c3e
commit 551210fb63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp
View File

@ -64,6 +64,7 @@ public:
layer->Set(Config::MAIN_FASTMEM, m_settings.m_Fastmem);
layer->Set(Config::MAIN_SKIP_IPL, m_settings.m_SkipIPL);
layer->Set(Config::MAIN_LOAD_IPL_DUMP, m_settings.m_LoadIPLDump);
layer->Set(Config::GFX_HACK_DEFER_EFB_COPIES, m_settings.m_DeferEFBCopies);
if (m_settings.m_StrictSettingsSync)
{

1
Source/Core/Core/NetPlayClient.cpp
View File

@ -543,6 +543,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
packet >> m_net_settings.m_ArbitraryMipmapDetection;
packet >> m_net_settings.m_ArbitraryMipmapDetectionThreshold;
packet >> m_net_settings.m_EnableGPUTextureDecoding;
packet >> m_net_settings.m_DeferEFBCopies;
packet >> m_net_settings.m_StrictSettingsSync;
m_initial_rtc = Common::PacketReadU64(packet);

1
Source/Core/Core/NetPlayProto.h
View File

@ -74,6 +74,7 @@ struct NetSettings
bool m_ArbitraryMipmapDetection;
float m_ArbitraryMipmapDetectionThreshold;
bool m_EnableGPUTextureDecoding;
bool m_DeferEFBCopies;
bool m_StrictSettingsSync;
bool m_SyncSaveData;
std::string m_SaveDataRegion;

1
Source/Core/Core/NetPlayServer.cpp
View File

@ -1052,6 +1052,7 @@ bool NetPlayServer::StartGame()
spac << m_settings.m_ArbitraryMipmapDetection;
spac << m_settings.m_ArbitraryMipmapDetectionThreshold;
spac << m_settings.m_EnableGPUTextureDecoding;
spac << m_settings.m_DeferEFBCopies;
spac << m_settings.m_StrictSettingsSync;
spac << initial_rtc;
spac << m_settings.m_SyncSaveData;

1
Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
View File

@ -447,6 +447,7 @@ void NetPlayDialog::OnStart()
settings.m_ArbitraryMipmapDetectionThreshold =
Config::Get(Config::GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION_THRESHOLD);
settings.m_EnableGPUTextureDecoding = Config::Get(Config::GFX_ENABLE_GPU_TEXTURE_DECODING);
settings.m_DeferEFBCopies = Config::Get(Config::GFX_HACK_DEFER_EFB_COPIES);
settings.m_StrictSettingsSync = m_strict_settings_sync_box->isChecked();
settings.m_SyncSaveData = m_sync_save_data_box->isChecked();