From caf2fc3c3ef06c79a1c9e823e98e30d6c5006ceb Mon Sep 17 00:00:00 2001 From: Techjar Date: Mon, 12 Nov 2018 20:45:12 -0500 Subject: [PATCH] NetPlay: Sync Defer EFB Copies setting --- Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp | 1 + Source/Core/Core/NetPlayClient.cpp | 1 + Source/Core/Core/NetPlayProto.h | 1 + Source/Core/Core/NetPlayServer.cpp | 1 + Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp index 6aa190593c..d33d85d349 100644 --- a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp +++ b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp @@ -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) { diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp index 8762623414..20cbb3d638 100644 --- a/Source/Core/Core/NetPlayClient.cpp +++ b/Source/Core/Core/NetPlayClient.cpp @@ -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); diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h index 8e175de807..54989a0a1e 100644 --- a/Source/Core/Core/NetPlayProto.h +++ b/Source/Core/Core/NetPlayProto.h @@ -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; diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp index 8c5fa6eb3d..979b8e05e5 100644 --- a/Source/Core/Core/NetPlayServer.cpp +++ b/Source/Core/Core/NetPlayServer.cpp @@ -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; diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp index 1e47f80bb6..f48d2c89c5 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp @@ -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();