mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-19 12:41:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Take out limited shader stuff from Android launcher menu - shaders should be

Browse Source 
configured inside RA's built-in menu
This commit is contained in:
twinaphex 2015-03-04 21:04:24 +01:00
parent fa4464586e
commit d6b19f147a
4 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/phoenix/res/values/strings.xml
View File

@ -226,14 +226,8 @@
<string name="calibrate_refresh_rate_desc">Attempts to find the true refresh rate of monitor. Updates value in \'Force refresh rate (Hz)\' option. To help ensure accuracy, make sure no intense background services are running, and avoid triggering screensaver.</string>
<string name="set_os_reported_refresh_rate">Set OS-reported refresh rate</string>
<string name="set_os_reported_refresh_rate_desc">Sets refresh rate equal to OS-reported value. This might not be accurate for your device.</string>
<string name="shaders">Shaders</string>
<string name="bilinear_filter">Bilinear filter</string>
<string name="bilinear_filter_desc">Applies Bilinear filtering, smooths out edges (settings still apply even if no shader is selected).</string>
<string name="first_pass_shader">First-pass shader</string>
<string name="first_pass_shader_desc">Enable first pass shader (WARNING: performance varies per device and per shader).</string>
<string name="glsl_shader">GLSL shader</string>
<string name="glsl_shader_desc">Sets GLES2 style shader.</string>
<string name="glsl_shader_select">Select a GLSL shader</string>
<string name="fonts">Fonts</string>
<string name="onscreen_fonts">On-screen fonts</string>
<string name="onscreen_fonts_desc">Enable rendering of on-screen fonts for messages.</string>

19
android/phoenix/res/xml/video_preferences.xml
View File

@ -52,25 +52,6 @@
android:title="@string/set_os_reported_refresh_rate" />
</PreferenceCategory>
<!-- Shaders -->
<PreferenceCategory android:title="@string/shaders" >
<CheckBoxPreference
android:defaultValue="true"
android:key="video_smooth"
android:summary="@string/bilinear_filter_desc"
android:title="@string/bilinear_filter" />
<CheckBoxPreference
android:summary="@string/first_pass_shader_desc"
android:defaultValue="false"
android:key="video_shader_enable"
android:title="@string/first_pass_shader" />
<Preference
android:key="glsl_shader_pref"
android:summary="@string/glsl_shader_desc"
android:title="@string/glsl_shader"
android:dependency="video_shader_enable" />
</PreferenceCategory>
<!-- Fonts -->
<PreferenceCategory android:title="@string/fonts">
<CheckBoxPreference android:title="@string/onscreen_fonts"

17
android/phoenix/src/com/retroarch/browser/preferences/fragments/VideoPreferenceFragment.java
View File

@ -1,9 +1,6 @@
package com.retroarch.browser.preferences.fragments;
import java.io.File;
import com.retroarch.R;
import com.retroarch.browser.dirfragment.DirectoryFragment;
import com.retroarch.browser.preferences.fragments.util.PreferenceListFragment;
import android.content.SharedPreferences;
@ -30,7 +27,6 @@ public final class VideoPreferenceFragment extends PreferenceListFragment implem
// Set preference click listeners
findPreference("set_os_reported_ref_rate_pref").setOnPreferenceClickListener(this);
findPreference("glsl_shader_pref").setOnPreferenceClickListener(this);
}
@Override
@ -52,19 +48,6 @@ public final class VideoPreferenceFragment extends PreferenceListFragment implem
Toast.makeText(getActivity(), String.format(getString(R.string.using_os_reported_refresh_rate), rate), Toast.LENGTH_LONG).show();
}
// GLSL shader selection
else if (prefKey.equals("glsl_shader_pref"))
{
final DirectoryFragment shaderBrowser = DirectoryFragment.newInstance(R.string.glsl_shader_select);
File shaderDir = new File(getActivity().getApplicationInfo().dataDir, "shaders_glsl");
if (shaderDir.exists())
shaderBrowser.setStartDirectory(shaderDir.getAbsolutePath());
shaderBrowser.addAllowedExts(".glsl");
shaderBrowser.setPathSettingKey("video_shader");
shaderBrowser.show(getFragmentManager(), "shaderBrowser");
}
return true;
}

3
android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
View File

@ -234,9 +234,6 @@ public final class UserPreferences
}
config.setBoolean("video_scale_integer", prefs.getBoolean("video_scale_integer", false));
config.setString("video_shader", prefs.getString("video_shader", ""));
config.setBoolean("video_shader_enable", prefs.getBoolean("video_shader_enable", false) &&
new File(prefs.getString("video_shader", "")).exists());
if (prefs.contains("input_overlay_enable"))
config.setBoolean("input_overlay_enable", prefs.getBoolean("input_overlay_enable", true));