Permalink
Browse files

Merge pull request #7353 from hackbar/cleanup

Cleanup
  • Loading branch information...
delroth committed Aug 27, 2018
2 parents ca719db + 308ae11 commit 3d94dc18704fa78710cd71f417ec17fe6bed3c44
@@ -330,7 +330,7 @@ private void addGraphicsSettings(ArrayList<SettingsItem> sl)
sl.add(new SingleChoiceSetting(SettingsFile.KEY_VIDEO_BACKEND_INDEX, Settings.SECTION_INI_CORE, R.string.video_backend, R.string.video_backend_description, R.array.videoBackendEntries, R.array.videoBackendValues, 0, videoBackend));
sl.add(new CheckBoxSetting(SettingsFile.KEY_SHOW_FPS, Settings.SECTION_GFX_SETTINGS, R.string.show_fps, R.string.show_fps_description, false, showFps));
sl.add(new SingleChoiceSetting(SettingsFile.KEY_SHADER_COMPILATION_MODE, Settings.SECTION_GFX_SETTINGS, R.string.shader_compilation_mode, R.string.shader_compilation_mode_description, R.array.shaderCompilationModeEntries, R.array.shaderCompilationModeValues, 0, shaderCompilationMode));
sl.add(new CheckBoxSetting(SettingsFile.KEY_WAIT_FOR_SHADERS, Settings.SECTION_GFX_SETTINGS, R.string.wait_for_shaders, 0, false, waitForShaders));
sl.add(new CheckBoxSetting(SettingsFile.KEY_WAIT_FOR_SHADERS, Settings.SECTION_GFX_SETTINGS, R.string.wait_for_shaders, R.string.wait_for_shaders_description, false, waitForShaders));
sl.add(new SingleChoiceSetting(SettingsFile.KEY_ASPECT_RATIO, Settings.SECTION_GFX_SETTINGS, R.string.aspect_ratio, R.string.aspect_ratio_description, R.array.aspectRatioEntries, R.array.aspectRatioValues, 0, aspectRatio));
sl.add(new HeaderSetting(null, null, R.string.graphics_enhancements_and_hacks, 0));
@@ -53,9 +53,11 @@ protected void onCreate(Bundle savedInstanceState)
// Stuff in this block only happens when this activity is newly created (i.e. not a rotation)
if (savedInstanceState == null)
{
StartupHandler.HandleInit(this);
}
// Setup and/or sync channels
TvUtil.scheduleSyncingChannel(getApplicationContext());
TvUtil.scheduleSyncingChannel(getApplicationContext());
}
@Override
@@ -17,7 +17,9 @@ public static void HandleInit(FragmentActivity parent)
String start_file = "";
Bundle extras = parent.getIntent().getExtras();
if (extras != null)
{
start_file = extras.getString("AutoStartFile");
}
if (!TextUtils.isEmpty(start_file))
{
@@ -219,6 +219,7 @@
<string name="shader_compilation_mode">Shader Compilation Mode</string>
<string name="shader_compilation_mode_description">Specifies when to use Ubershaders. Disabled - Never, Hybrid - Use ubershaders while compiling specialized shaders. Exclusive - Use only ubershaders, largest performance impact. Skip Drawing - Do not draw objects while shaders are compiling, will cause broken effects.</string>
<string name="wait_for_shaders">Compile Shaders Before Starting</string>
<string name="wait_for_shaders_description">This causes a delay when launching games, but will reduce stuttering early on.</string>
<!-- Miscellaneous -->
<string name="yes">Yes</string>

0 comments on commit 3d94dc1

Please sign in to comment.