mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-06 12:40:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the names for shader compilation settings

Browse Source
This commit is contained in:
JosJuice 2019-10-19 11:26:18 +02:00
parent ac250f7c20
commit 05a37746b6
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Android/app/src/main/res/values/arrays.xml
View File

@ -205,12 +205,12 @@
<item>0</item> <item>0</item>
</integer-array> </integer-array>
<!-- Ubershader Mode Preference --> <!-- Shader Compilation Mode Preference -->
<string-array name="shaderCompilationModeEntries" translatable="false"> <string-array name="shaderCompilationModeEntries" translatable="false">
<item>Synchronous</item> <item>Specialized (Default)</item>
<item>Synchronous (Ubershaders)</item> <item>Exclusive Ubershaders</item>
<item>Asynchronous (Ubershaders)</item> <item>Hybrid Ubershaders</item>
<item>Asynchronous (Skip Drawing)</item> <item>Skip Drawing</item>
</string-array> </string-array>
<integer-array name="shaderCompilationModeValues" translatable="false"> <integer-array name="shaderCompilationModeValues" translatable="false">
<item>0</item> <item>0</item>
@ -219,12 +219,12 @@
<item>3</item> <item>3</item>
</integer-array> </integer-array>
<!-- Ubershader Mode Dynamic Descriptions --> <!-- Shader Compilation Mode Dynamic Descriptions -->
<string-array name="shaderCompilationDescriptionEntries" translatable="false"> <string-array name="shaderCompilationDescriptionEntries" translatable="false">
<item>Synchronous: Ubershaders are never used. Stuttering will occur during shader compilation, but GPU demands are low. Recommended for low-end hardware.\nIf unsure, select this mode.</item> <item>Specialized (Default): Ubershaders are never used. Stuttering will occur during shader compilation, but GPU demands are low. Recommended for low-end hardware. If unsure, select this mode.</item>
<item>Synchronous (Ubershaders): Ubershaders will always be used. Provides a near stutter-free experience at the cost of high GPU performance requirements. Only recommended for high-end systems.</item> <item>Exclusive Ubershaders: Ubershaders will always be used. Provides a near stutter-free experience at the cost of very high GPU performance requirements. Don\'t use this unless you encountered stuttering with Hybrid Ubershaders and have a very powerful GPU.</item>
<item>Asynchronous (Ubershaders): Ubershaders will be used to prevent stuttering during shader compilation, but specialized shaders will be used when they will not cause stuttering. In the best case it eliminates shader compilation stuttering while having minimal performance impact, but results depend on video driver behavior.</item> <item>Hybrid Ubershaders: Ubershaders will be used to prevent stuttering during shader compilation, but specialized shaders will be used when they will not cause stuttering. In the best case it eliminates shader compilation stuttering while having minimal performance impact, but results depend on video driver behavior.</item>
<item>Asynchronous (Skip Drawing): Prevents shader compilation stuttering by not rendering waiting objects. Can work in scenarios where Ubershaders doesn\'t, at the cost of introducing visual glitches and broken effects. Not recommended, only use if the other options give poor results on your system.</item> <item>Skip Drawing: Prevents shader compilation stuttering by not rendering waiting objects. Can work in scenarios where Ubershaders doesn\'t, at the cost of introducing visual glitches and broken effects. Not recommended, only use if the other options give poor results on your system.</item>
</string-array> </string-array>
<integer-array name="shaderCompilationDescriptionValues" translatable="false"> <integer-array name="shaderCompilationDescriptionValues" translatable="false">
<item>0</item> <item>0</item>

30
Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
View File

@ -113,10 +113,10 @@ void GeneralWidget::CreateWidgets()
auto* shader_compilation_layout = new QGridLayout(); auto* shader_compilation_layout = new QGridLayout();
const std::array<const char*, 4> modes = {{ const std::array<const char*, 4> modes = {{
QT_TR_NOOP("Synchronous"), QT_TR_NOOP("Specialized (Default)"),
QT_TR_NOOP("Synchronous (Ubershaders)"), QT_TR_NOOP("Exclusive Ubershaders"),
QT_TR_NOOP("Asynchronous (Ubershaders)"), QT_TR_NOOP("Hybrid Ubershaders"),
QT_TR_NOOP("Asynchronous (Skip Drawing)"), QT_TR_NOOP("Skip Drawing"),
}}; }};
for (size_t i = 0; i < modes.size(); i++) for (size_t i = 0; i < modes.size(); i++)
{ {
@ -250,20 +250,22 @@ void GeneralWidget::AddDescriptions()
QT_TR_NOOP("Shows chat messages, buffer changes, and desync alerts " QT_TR_NOOP("Shows chat messages, buffer changes, and desync alerts "
"while playing NetPlay.<br><br><dolphin_emphasis>If unsure, leave " "while playing NetPlay.<br><br><dolphin_emphasis>If unsure, leave "
"this unchecked.</dolphin_emphasis>"); "this unchecked.</dolphin_emphasis>");
static const char TR_SHADER_COMPILE_SYNC_DESCRIPTION[] = static const char TR_SHADER_COMPILE_SPECIALIZED_DESCRIPTION[] =
QT_TR_NOOP("Ubershaders are never used. Stuttering will occur during shader " QT_TR_NOOP("Ubershaders are never used. Stuttering will occur during shader "
"compilation, but GPU demands are low.<br><br>Recommended for low-end hardware. " "compilation, but GPU demands are low.<br><br>Recommended for low-end hardware. "
"<br><br><dolphin_emphasis>If unsure, select this mode.</dolphin_emphasis>"); "<br><br><dolphin_emphasis>If unsure, select this mode.</dolphin_emphasis>");
static const char TR_SHADER_COMPILE_SYNC_UBER_DESCRIPTION[] = QT_TR_NOOP( // The "very powerful GPU" mention below is by 2021 PC GPU standards
static const char TR_SHADER_COMPILE_EXCLUSIVE_UBER_DESCRIPTION[] = QT_TR_NOOP(
"Ubershaders will always be used. Provides a near stutter-free experience at the cost of " "Ubershaders will always be used. Provides a near stutter-free experience at the cost of "
"high GPU performance requirements.<br><br><dolphin_emphasis>Only recommended " "very high GPU performance requirements.<br><br><dolphin_emphasis>Don't use this unless you "
"for high-end systems.</dolphin_emphasis>"); "encountered stuttering with Hybrid Ubershaders and have a very powerful "
static const char TR_SHADER_COMPILE_ASYNC_UBER_DESCRIPTION[] = QT_TR_NOOP( "GPU.</dolphin_emphasis>");
static const char TR_SHADER_COMPILE_HYBRID_UBER_DESCRIPTION[] = QT_TR_NOOP(
"Ubershaders will be used to prevent stuttering during shader compilation, but " "Ubershaders will be used to prevent stuttering during shader compilation, but "
"specialized shaders will be used when they will not cause stuttering.<br><br>In the " "specialized shaders will be used when they will not cause stuttering.<br><br>In the "
"best case it eliminates shader compilation stuttering while having minimal " "best case it eliminates shader compilation stuttering while having minimal "
"performance impact, but results depend on video driver behavior."); "performance impact, but results depend on video driver behavior.");
static const char TR_SHADER_COMPILE_ASYNC_SKIP_DESCRIPTION[] = QT_TR_NOOP( static const char TR_SHADER_COMPILE_SKIP_DRAWING_DESCRIPTION[] = QT_TR_NOOP(
"Prevents shader compilation stuttering by not rendering waiting objects. Can work in " "Prevents shader compilation stuttering by not rendering waiting objects. Can work in "
"scenarios where Ubershaders doesn't, at the cost of introducing visual glitches and broken " "scenarios where Ubershaders doesn't, at the cost of introducing visual glitches and broken "
"effects.<br><br><dolphin_emphasis>Not recommended, only use if the other " "effects.<br><br><dolphin_emphasis>Not recommended, only use if the other "
@ -301,13 +303,13 @@ void GeneralWidget::AddDescriptions()
m_render_main_window->SetDescription(tr(TR_RENDER_TO_MAINWINDOW_DESCRIPTION)); m_render_main_window->SetDescription(tr(TR_RENDER_TO_MAINWINDOW_DESCRIPTION));
m_shader_compilation_mode[0]->SetDescription(tr(TR_SHADER_COMPILE_SYNC_DESCRIPTION)); m_shader_compilation_mode[0]->SetDescription(tr(TR_SHADER_COMPILE_SPECIALIZED_DESCRIPTION));
m_shader_compilation_mode[1]->SetDescription(tr(TR_SHADER_COMPILE_SYNC_UBER_DESCRIPTION)); m_shader_compilation_mode[1]->SetDescription(tr(TR_SHADER_COMPILE_EXCLUSIVE_UBER_DESCRIPTION));
m_shader_compilation_mode[2]->SetDescription(tr(TR_SHADER_COMPILE_ASYNC_UBER_DESCRIPTION)); m_shader_compilation_mode[2]->SetDescription(tr(TR_SHADER_COMPILE_HYBRID_UBER_DESCRIPTION));
m_shader_compilation_mode[3]->SetDescription(tr(TR_SHADER_COMPILE_ASYNC_SKIP_DESCRIPTION)); m_shader_compilation_mode[3]->SetDescription(tr(TR_SHADER_COMPILE_SKIP_DRAWING_DESCRIPTION));
m_wait_for_shaders->SetDescription(tr(TR_SHADER_COMPILE_BEFORE_START_DESCRIPTION)); m_wait_for_shaders->SetDescription(tr(TR_SHADER_COMPILE_BEFORE_START_DESCRIPTION));
} }