From 25767ef0131a6532d94bc4cd471a76e90f320e6a Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Sat, 6 Apr 2013 03:53:35 +0200
Subject: [PATCH] Revert "More scrubbing"

This reverts commit 5bfa31fa864c5eb14b3084ca59af46ba767be585.
---
 android/phoenix/res/xml/prefs.xml             | 33 +++++++++++++++++++
 .../src/org/retroarch/browser/RetroArch.java  | 10 ++++++
 config.def.h                                  | 10 ++++++
 3 files changed, 53 insertions(+)

diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index 1ddf627121..949bba3ea1 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -132,6 +132,39 @@
                     android:targetPackage="org.retroarch" />
             </Preference>
         </PreferenceCategory>
+        <PreferenceCategory android:title="Shaders (Multi-pass)" >
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="video_render_to_texture"
+                android:summary="Render first pass to texture (FBO). Stretch to screen with second shader."
+                android:title="Render to texture" />
+            <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="video_second_pass_shader_enable"
+                android:summary="Enable custom shader for use after rendering to FBO (WARNING: recommended system requirements for these shaders is a Tegra 4/Exynos5 class GPU and/or higher)."
+                android:title="Enable shader #2" />
+
+            <Preference
+                android:summary="Sets shader to use for second pass."
+                android:title="XML shader (2nd pass)"
+                android:dependency="video_second_pass_shader_enable" >
+                <intent
+                    android:targetClass="org.retroarch.browser.Shader2Activity"
+                    android:targetPackage="org.retroarch" />
+            </Preference>
+
+            <ListPreference
+                android:entries="@array/fbo_scales"
+                android:entryValues="@array/fbo_scale_values"
+                android:key="video_fbo_scale"
+                android:summary="Scale to use when rendering to FBO."
+                android:title="FBO scale" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="video_second_pass_smooth"
+                android:summary="Use Bilinear filtering on FBO texture on second pass."
+                android:title="Second pass Bilinear Filtering" />
+        </PreferenceCategory>
         <PreferenceCategory android:title="Fonts">
             <CheckBoxPreference android:title="Enable on-screen fonts"
                 android:summary="Enable rendering of on-screen fonts for messages."
diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java
index 3cd5d55391..7b97d4696a 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroArch.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java
@@ -400,6 +400,16 @@ public class RetroArch extends Activity implements
 			config.setString("video_bsnes_shader", "");
 		}
 		
+		config.setBoolean("video_render_to_texture", prefs.getBoolean("video_render_to_texture", false));
+		config.setString("video_second_pass_shader",
+				prefs.getBoolean("video_second_pass_shader_enable", false) ?
+						prefs.getString("video_second_pass_shader", "") : "");
+		
+		config.setBoolean("video_second_pass_smooth", prefs.getBoolean("video_second_pass_smooth", true));
+		
+		config.setString("video_fbo_scale_x", prefs.getString("video_fbo_scale", "2.0"));
+		config.setString("video_fbo_scale_y", prefs.getString("video_fbo_scale", "2.0"));
+		
 		boolean useOverlay = prefs.getBoolean("input_overlay_enable", true);
 		if (useOverlay) {
 			String overlayPath = prefs.getString("input_overlay", getCacheDir() + "/Overlays/snes-landscape.cfg");
diff --git a/config.def.h b/config.def.h
index ce19fdc890..50f11a7e7b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -294,6 +294,16 @@ static const float message_pos_offset_y = 0.05;
 // Color of the message.
 static const uint32_t message_color = 0xffff00; // RGB hex value.
 
+// Render-to-texture before rendering to screen (multi-pass shaders)
+#if defined(__CELLOS_LV2__)
+static const bool render_to_texture = true;
+#else
+static const bool render_to_texture = false;
+#endif
+static const float fbo_scale_x = 2.0;
+static const float fbo_scale_y = 2.0;
+static const bool second_pass_smooth = true;
+
 // Record post-filtered (CPU filter) video rather than raw game output.
 static const bool post_filter_record = false;