Skip to content

Commit 4b8f845

Browse files
committed
Dual core off by default (again), minimum netplay buffer 2>3 to comp for Rush
1 parent 17ff22e commit 4b8f845

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

Source/Core/Core/Config/MainSettings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ const Info<bool> MAIN_SMOOTH_EARLY_PRESENTATION{{System::Main, "Core", "SmoothEa
5555
// Currently enabled by default on Android because the performance boost is really needed.
5656
constexpr bool DEFAULT_CPU_THREAD = true;
5757
#else
58-
// P+ change: enable dual core for desktop, as we're targeting low end machines for default settings
59-
constexpr bool DEFAULT_CPU_THREAD = true;
58+
// Turned back off after testing showed dual core increases input lag on some machines
59+
constexpr bool DEFAULT_CPU_THREAD = false;
6060
#endif
6161
const Info<bool> MAIN_CPU_THREAD{{System::Main, "Core", "CPUThread"}, DEFAULT_CPU_THREAD};
6262
const Info<bool> MAIN_SYNC_ON_SKIP_IDLE{{System::Main, "Core", "SyncOnSkipIdle"}, true};

Source/Core/Core/Config/NetplaySettings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ const Info<bool> NETPLAY_ENABLE_CHUNKED_UPLOAD_LIMIT{
4343
{System::Main, "NetPlay", "EnableChunkedUploadLimit"}, false};
4444
const Info<u32> NETPLAY_CHUNKED_UPLOAD_LIMIT{{System::Main, "NetPlay", "ChunkedUploadLimit"}, 3000};
4545

46-
const Info<u32> NETPLAY_MINIMUM_BUFFER_SIZE{{System::Main, "NetPlay", "MinimumBufferSize"}, 2};
47-
const Info<u32> NETPLAY_PLAYER_BUFFER_SIZE{{System::Main, "NetPlay", "PlayerBufferSize"}, 2};
46+
const Info<u32> NETPLAY_MINIMUM_BUFFER_SIZE{{System::Main, "NetPlay", "MinimumBufferSize"}, 3};
47+
const Info<u32> NETPLAY_PLAYER_BUFFER_SIZE{{System::Main, "NetPlay", "PlayerBufferSize"}, 3};
4848
const Info<u32> NETPLAY_CLIENT_BUFFER_SIZE{{System::Main, "NetPlay", "BufferSizeClient"}, 1};
4949

5050
const Info<bool> NETPLAY_BRAWL_MUSIC_OFF{{System::Main, "NetPlay", "BrawlMusicOff"}, false};

Source/Core/Core/NetPlayServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ NetPlayServer::NetPlayServer(const u16 port, const bool forward_port, NetPlayUI*
173173
is_connected = true;
174174
m_do_loop = true;
175175
m_thread = std::thread(&NetPlayServer::ThreadFunc, this);
176-
m_minimum_buffer_size = 2;
176+
m_minimum_buffer_size = 3;
177177
m_chunked_data_thread = std::thread(&NetPlayServer::ChunkedDataThreadFunc, this);
178178

179179
#ifdef USE_UPNP

Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ void AdvancedWidget::AddDescriptions()
273273
static const char TR_CACHE_CUSTOM_TEXTURE_DESCRIPTION[] = QT_TR_NOOP(
274274
"Caches custom textures to system RAM on startup.<br><br>This can require exponentially "
275275
"more RAM but fixes possible stuttering.<br><br><dolphin_emphasis>If unsure, leave this "
276-
"unchecked.</dolphin_emphasis>");
276+
"checked.</dolphin_emphasis>");
277277
static const char TR_DUMP_EFB_DESCRIPTION[] =
278278
QT_TR_NOOP("Dumps the contents of EFB copies to User/Dump/Textures/.<br><br>"
279279
"<dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>");

Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ void GeneralWidget::AddDescriptions()
258258
"<br><br><b>Custom (Stretch)</b>: Similar to `Custom`, but stretches the image to the "
259259
"specified aspect ratio. This will usually distort the image's proportions, and should not "
260260
"be used under normal circumstances."
261-
"<br><br><dolphin_emphasis>If unsure, select Auto.</dolphin_emphasis>");
261+
"<br><br><dolphin_emphasis>If unsure, select Force 69:40 (P+ Widescreen).</dolphin_emphasis>");
262262
static const char TR_VSYNC_DESCRIPTION[] = QT_TR_NOOP(
263263
"Waits for vertical blanks in order to prevent tearing.<br><br>Decreases performance "
264264
"if emulation speed is below 100%.<br><br><dolphin_emphasis>If unsure, leave "
@@ -267,7 +267,7 @@ void GeneralWidget::AddDescriptions()
267267
static const char TR_SHADER_COMPILE_SPECIALIZED_DESCRIPTION[] =
268268
QT_TR_NOOP("Ubershaders are never used. Stuttering will occur during shader "
269269
"compilation, but GPU demands are low.<br><br>Recommended for low-end hardware. "
270-
"<br><br><dolphin_emphasis>If unsure, select this mode.</dolphin_emphasis>");
270+
"<br><br><dolphin_emphasis>Not recommended, use other options.</dolphin_emphasis>");
271271
// The "very powerful GPU" mention below is by 2021 PC GPU standards
272272
static const char TR_SHADER_COMPILE_EXCLUSIVE_UBER_DESCRIPTION[] = QT_TR_NOOP(
273273
"Ubershaders will always be used. Provides a near stutter-free experience at the cost of "
@@ -282,15 +282,15 @@ void GeneralWidget::AddDescriptions()
282282
static const char TR_SHADER_COMPILE_SKIP_DRAWING_DESCRIPTION[] = QT_TR_NOOP(
283283
"Prevents shader compilation stuttering by not rendering waiting objects. Can work in "
284284
"scenarios where Ubershaders doesn't, at the cost of introducing visual glitches and broken "
285-
"effects.<br><br><dolphin_emphasis>Not recommended, only use if the other "
286-
"options give poor results.</dolphin_emphasis>");
285+
"effects.<br><br><dolphin_emphasis>Use this option if you encounter excessive stuttering "
286+
"with other options.</dolphin_emphasis>");
287287
static const char TR_SHADER_COMPILE_BEFORE_START_DESCRIPTION[] =
288288
QT_TR_NOOP("Waits for all shaders to finish compiling before starting a game. Enabling this "
289289
"option may reduce stuttering or hitching for a short time after the game is "
290290
"started, at the cost of a longer delay before the game starts. For systems with "
291291
"two or fewer cores, it is recommended to enable this option, as a large shader "
292292
"queue may reduce frame rates.<br><br><dolphin_emphasis>Otherwise, if "
293-
"unsure, leave this unchecked.</dolphin_emphasis>");
293+
"unsure, leave this checked.</dolphin_emphasis>");
294294

295295
m_backend_combo->SetTitle(tr("Backend"));
296296
m_backend_combo->SetDescription(

Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void HacksWidget::AddDescriptions()
203203
"expect all XFB copies to be displayed. However, turning this setting on reduces latency."
204204
"<br><br>Enabling this also forces an effect equivalent to the "
205205
"Skip Presenting Duplicate Frames setting."
206-
"<br><br><dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>");
206+
"<br><br><dolphin_emphasis>If unsure, leave this checked.</dolphin_emphasis>");
207207
static const char TR_SKIP_DUPLICATE_XFBS_DESCRIPTION[] = QT_TR_NOOP(
208208
"Skips presentation of duplicate frames (XFB copies) in 25fps/30fps games. "
209209
"This may improve performance on low-end devices, while making frame pacing less consistent."

Source/Core/DolphinQt/Settings/GeneralPane.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ void GeneralPane::AddDescriptions()
373373
"burden by spreading Dolphin's heaviest load across two cores, which usually "
374374
"improves performance. However, it can result in glitches and crashes."
375375
"<br><br>This setting cannot be changed while emulation is active."
376-
"<br><br><dolphin_emphasis>If unsure, leave this checked.</dolphin_emphasis>");
376+
"<br><br><dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>");
377377
static constexpr char TR_CHEATS_DESCRIPTION[] = QT_TR_NOOP(
378378
"Enables the use of AR and Gecko cheat codes which can be used to modify games' behavior. "
379379
"These codes can be configured with the Cheats Manager in the Tools menu."

0 commit comments

Comments
 (0)