The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-10 22:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7739 from zackhow/multib

Browse Source 
Android: Disable backend multithreading and add option to gfx menu
This commit is contained in:
Anthony 2019-02-03 12:44:00 -08:00 committed by GitHub
commit f65b3a998c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
View File

@ -452,6 +452,7 @@ public final class SettingsFragmentPresenter
enhancementSection.getSetting(SettingsFile.KEY_ARBITRARY_MIPMAP_DETECTION); enhancementSection.getSetting(SettingsFile.KEY_ARBITRARY_MIPMAP_DETECTION);
Setting wideScreenHack = gfxSection.getSetting(SettingsFile.KEY_WIDE_SCREEN_HACK); Setting wideScreenHack = gfxSection.getSetting(SettingsFile.KEY_WIDE_SCREEN_HACK);
Setting force24BitColor = enhancementSection.getSetting(SettingsFile.KEY_FORCE_24_BIT_COLOR); Setting force24BitColor = enhancementSection.getSetting(SettingsFile.KEY_FORCE_24_BIT_COLOR);
Setting backendMultithreading = gfxSection.getSetting(SettingsFile.KEY_BACKEND_MULTITHREADING);
sl.add(new SingleChoiceSetting(SettingsFile.KEY_INTERNAL_RES, Settings.SECTION_GFX_SETTINGS, sl.add(new SingleChoiceSetting(SettingsFile.KEY_INTERNAL_RES, Settings.SECTION_GFX_SETTINGS,
R.string.internal_resolution, R.string.internal_resolution_description, R.string.internal_resolution, R.string.internal_resolution_description,
@ -501,6 +502,10 @@ public final class SettingsFragmentPresenter
sl.add(new CheckBoxSetting(SettingsFile.KEY_WIDE_SCREEN_HACK, Settings.SECTION_GFX_SETTINGS, sl.add(new CheckBoxSetting(SettingsFile.KEY_WIDE_SCREEN_HACK, Settings.SECTION_GFX_SETTINGS,
R.string.wide_screen_hack, R.string.wide_screen_hack_description, false, R.string.wide_screen_hack, R.string.wide_screen_hack_description, false,
wideScreenHack)); wideScreenHack));
sl.add(new CheckBoxSetting(SettingsFile.KEY_BACKEND_MULTITHREADING,
Settings.SECTION_GFX_SETTINGS,
R.string.backend_multithreading, R.string.backend_multithreading_description, false,
backendMultithreading));
/* /*
Check if we support stereo Check if we support stereo

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java
View File

@ -72,6 +72,7 @@ public final class SettingsFile
public static final String KEY_ARBITRARY_MIPMAP_DETECTION = "ArbitraryMipmapDetection"; public static final String KEY_ARBITRARY_MIPMAP_DETECTION = "ArbitraryMipmapDetection";
public static final String KEY_WIDE_SCREEN_HACK = "wideScreenHack"; public static final String KEY_WIDE_SCREEN_HACK = "wideScreenHack";
public static final String KEY_FORCE_24_BIT_COLOR = "ForceTrueColor"; public static final String KEY_FORCE_24_BIT_COLOR = "ForceTrueColor";
public static final String KEY_BACKEND_MULTITHREADING = "BackendMultithreading";
public static final String KEY_STEREO_MODE = "StereoMode"; public static final String KEY_STEREO_MODE = "StereoMode";
public static final String KEY_STEREO_DEPTH = "StereoDepth"; public static final String KEY_STEREO_DEPTH = "StereoDepth";

2
Source/Android/app/src/main/res/values/strings.xml
View File

@ -199,6 +199,8 @@
<string name="stereoscopy_convergence_description">Control the distance of the convergence plane, this is the distance at which objects will appear to be in front of the screen.\nA higher value creates stronger out-of-screen effects while a lower value is more comfortable.</string> <string name="stereoscopy_convergence_description">Control the distance of the convergence plane, this is the distance at which objects will appear to be in front of the screen.\nA higher value creates stronger out-of-screen effects while a lower value is more comfortable.</string>
<string name="stereoscopy_swap_eyes">Swap Eyes</string> <string name="stereoscopy_swap_eyes">Swap Eyes</string>
<string name="stereoscopy_swap_eyes_description">Swap the left and right eye, mostly useful if you want to view side-by-side cross-eyed.</string> <string name="stereoscopy_swap_eyes_description">Swap the left and right eye, mostly useful if you want to view side-by-side cross-eyed.</string>
<string name="backend_multithreading">Backend Multithreading</string> <!--Backend Multithreading is only disabled by default on Android -->
<string name="backend_multithreading_description">Enables CPU multithreading(Vulkan only). May affect performance. If unsure, leave unchecked</string>
<string name="hacks_submenu">Hacks</string> <string name="hacks_submenu">Hacks</string>
<string name="embedded_frame_buffer">Embedded Frame Buffer</string> <string name="embedded_frame_buffer">Embedded Frame Buffer</string>

7
Source/Core/Core/Config/GraphicsSettings.cpp
View File

@ -71,8 +71,15 @@ const ConfigInfo<bool> GFX_BORDERLESS_FULLSCREEN{{System::GFX, "Settings", "Bord
false}; false};
const ConfigInfo<bool> GFX_ENABLE_VALIDATION_LAYER{ const ConfigInfo<bool> GFX_ENABLE_VALIDATION_LAYER{
{System::GFX, "Settings", "EnableValidationLayer"}, false}; {System::GFX, "Settings", "EnableValidationLayer"}, false};
#if defined(ANDROID)
const ConfigInfo<bool> GFX_BACKEND_MULTITHREADING{
{System::GFX, "Settings", "BackendMultithreading"}, false};
#else
const ConfigInfo<bool> GFX_BACKEND_MULTITHREADING{ const ConfigInfo<bool> GFX_BACKEND_MULTITHREADING{
{System::GFX, "Settings", "BackendMultithreading"}, true}; {System::GFX, "Settings", "BackendMultithreading"}, true};
#endif
const ConfigInfo<int> GFX_COMMAND_BUFFER_EXECUTE_INTERVAL{ const ConfigInfo<int> GFX_COMMAND_BUFFER_EXECUTE_INTERVAL{
{System::GFX, "Settings", "CommandBufferExecuteInterval"}, 100}; {System::GFX, "Settings", "CommandBufferExecuteInterval"}, 100};
const ConfigInfo<bool> GFX_SHADER_CACHE{{System::GFX, "Settings", "ShaderCache"}, true}; const ConfigInfo<bool> GFX_SHADER_CACHE{{System::GFX, "Settings", "ShaderCache"}, true};

5
Source/Core/VideoCommon/VideoConfig.cpp
View File

@ -49,7 +49,12 @@ VideoConfig::VideoConfig()
backend_info.bSupportsBPTCTextures = false; backend_info.bSupportsBPTCTextures = false;
bEnableValidationLayer = false; bEnableValidationLayer = false;
#if defined(ANDROID)
bBackendMultithreading = false;
#else
bBackendMultithreading = true; bBackendMultithreading = true;
#endif
} }
void VideoConfig::Refresh() void VideoConfig::Refresh()