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 #7937 from Techjar/netplay-defer-efb-invalidation 

NetPlay: Synchronize EFB access cache options
This commit is contained in:
Connor McLaughlin 2019-03-29 20:31:15 +10:00 committed by GitHub
parent a50a34b94b 6e5d92e3c3
commit 78cf615a9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,8 @@ public:
layer->Set(Config::MAIN_SKIP_IPL, m_settings.m_SkipIPL); layer->Set(Config::MAIN_SKIP_IPL, m_settings.m_SkipIPL);
layer->Set(Config::MAIN_LOAD_IPL_DUMP, m_settings.m_LoadIPLDump); layer->Set(Config::MAIN_LOAD_IPL_DUMP, m_settings.m_LoadIPLDump);
layer->Set(Config::GFX_HACK_DEFER_EFB_COPIES, m_settings.m_DeferEFBCopies); layer->Set(Config::GFX_HACK_DEFER_EFB_COPIES, m_settings.m_DeferEFBCopies);
layer->Set(Config::GFX_HACK_EFB_ACCESS_TILE_SIZE, m_settings.m_EFBAccessTileSize);
layer->Set(Config::GFX_HACK_EFB_DEFER_INVALIDATION, m_settings.m_EFBAccessDeferInvalidation);
if (m_settings.m_StrictSettingsSync) if (m_settings.m_StrictSettingsSync)
{ {

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

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

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

@ -75,6 +75,8 @@ struct NetSettings
float m_ArbitraryMipmapDetectionThreshold; float m_ArbitraryMipmapDetectionThreshold;
bool m_EnableGPUTextureDecoding; bool m_EnableGPUTextureDecoding;
bool m_DeferEFBCopies; bool m_DeferEFBCopies;
bool m_EFBAccessTileSize;
bool m_EFBAccessDeferInvalidation;
bool m_StrictSettingsSync; bool m_StrictSettingsSync;
bool m_SyncSaveData; bool m_SyncSaveData;
bool m_SyncCodes; bool m_SyncCodes;

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

@ -1208,6 +1208,8 @@ bool NetPlayServer::StartGame()
spac << m_settings.m_ArbitraryMipmapDetectionThreshold; spac << m_settings.m_ArbitraryMipmapDetectionThreshold;
spac << m_settings.m_EnableGPUTextureDecoding; spac << m_settings.m_EnableGPUTextureDecoding;
spac << m_settings.m_DeferEFBCopies; spac << m_settings.m_DeferEFBCopies;
spac << m_settings.m_EFBAccessTileSize;
spac << m_settings.m_EFBAccessDeferInvalidation;
spac << m_settings.m_StrictSettingsSync; spac << m_settings.m_StrictSettingsSync;
spac << initial_rtc; spac << initial_rtc;
spac << m_settings.m_SyncSaveData; spac << m_settings.m_SyncSaveData;

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

@ -475,6 +475,8 @@ void NetPlayDialog::OnStart()
Config::Get(Config::GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION_THRESHOLD); Config::Get(Config::GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION_THRESHOLD);
settings.m_EnableGPUTextureDecoding = Config::Get(Config::GFX_ENABLE_GPU_TEXTURE_DECODING); settings.m_EnableGPUTextureDecoding = Config::Get(Config::GFX_ENABLE_GPU_TEXTURE_DECODING);
settings.m_DeferEFBCopies = Config::Get(Config::GFX_HACK_DEFER_EFB_COPIES); settings.m_DeferEFBCopies = Config::Get(Config::GFX_HACK_DEFER_EFB_COPIES);
settings.m_EFBAccessTileSize = Config::Get(Config::GFX_HACK_EFB_ACCESS_TILE_SIZE);
settings.m_EFBAccessDeferInvalidation = Config::Get(Config::GFX_HACK_EFB_DEFER_INVALIDATION);
settings.m_StrictSettingsSync = m_strict_settings_sync_action->isChecked(); settings.m_StrictSettingsSync = m_strict_settings_sync_action->isChecked();
settings.m_SyncSaveData = m_sync_save_data_action->isChecked(); settings.m_SyncSaveData = m_sync_save_data_action->isChecked();
settings.m_SyncCodes = m_sync_codes_action->isChecked(); settings.m_SyncCodes = m_sync_codes_action->isChecked();