Update LibretroDroid version. Tweak CUT2/3 parameters.

Swordfish90 · Sep 29, 2024 · 441e1e7 · 441e1e7
1 parent 8e0093a
commit 441e1e7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/buildSrc/src/main/java/deps.kt b/buildSrc/src/main/java/deps.kt
@@ -23,7 +23,7 @@ object deps {
         const val serialization   = "1.2.2"
         const val fragment        = "1.5.1"
         const val activity        = "1.7.2"
-        const val libretrodroid   = "c36b44fbd7"
+        const val libretrodroid   = "0.12.1"
         const val radialgamepad   = "2.0.0"
         const val composeBom      = "2024.02.02"
 

diff --git a/lemuroid-app/build.gradle.kts b/lemuroid-app/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 android {
     defaultConfig {
-        versionCode = 211
+        versionCode = 213
         versionName = "1.16.1" // Always remember to update Cores Tag!
         applicationId = "com.swordfish.lemuroid"
     }

diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/game/ShaderChooser.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/shared/game/ShaderChooser.kt
@@ -132,7 +132,6 @@ object ShaderChooser {
             ShaderConfig.CUT2(
                 blendMinContrastEdge = 0.00f,
                 blendMaxContrastEdge = 0.30f,
-                softEdgesSharpeningAmount = 0.75f,
                 blendMaxSharpness = 0.75f,
                 edgeMinValue = 0.025f
             )
@@ -141,43 +140,38 @@ object ShaderChooser {
             ShaderConfig.CUT2(
                 blendMinContrastEdge = 0.00f,
                 blendMaxContrastEdge = 0.30f,
-                softEdgesSharpeningAmount = 0.75f,
                 blendMaxSharpness = 0.75f,
                 edgeMinValue = 0.025f
             )
 
         val upscale16BitsMobile =
             ShaderConfig.CUT2(
                 blendMinContrastEdge = 0.10f,
-                blendMaxContrastEdge = 0.40f,
-                softEdgesSharpeningAmount = 0.75f,
+                blendMaxContrastEdge = 0.50f,
                 blendMaxSharpness = 0.75f,
                 edgeMinValue = 0.025f
             )
 
         val upscale16Bits =
             ShaderConfig.CUT2(
                 blendMinContrastEdge = 0.10f,
-                blendMaxContrastEdge = 0.40f,
-                softEdgesSharpeningAmount = 0.75f,
+                blendMaxContrastEdge = 0.50f,
                 blendMaxSharpness = 0.75f,
                 edgeMinValue = 0.025f
             )
 
         val upscale32Bits =
             ShaderConfig.CUT2(
                 blendMinContrastEdge = 0.10f,
-                blendMaxContrastEdge = 0.40f,
-                softEdgesSharpeningAmount = 0.75f,
+                blendMaxContrastEdge = 0.50f,
                 blendMaxSharpness = 0.75f,
                 edgeMinValue = 0.025f
             )
 
         val modern =
             ShaderConfig.CUT2(
                 blendMinContrastEdge = 0.10f,
-                blendMaxContrastEdge = 0.40f,
-                softEdgesSharpeningAmount = 0.75f,
+                blendMaxContrastEdge = 0.50f,
                 blendMaxSharpness = 0.50f,
                 edgeMinValue = 0.025f
             )
@@ -198,54 +192,54 @@ object ShaderChooser {
             ShaderConfig.CUT3(
                 blendMinContrastEdge = 0.00f,
                 blendMaxContrastEdge = 0.30f,
-                softEdgesSharpeningAmount = 0.75f,
                 blendMaxSharpness = 0.75f,
-                edgeMinValue = 0.025f
+                edgeMinValue = 0.025f,
+                searchMinContrast = 0.75f,
             )
 
         val upscale8Bits =
             ShaderConfig.CUT3(
                 blendMinContrastEdge = 0.00f,
                 blendMaxContrastEdge = 0.30f,
-                softEdgesSharpeningAmount = 0.75f,
                 blendMaxSharpness = 0.75f,
-                edgeMinValue = 0.025f
+                edgeMinValue = 0.025f,
+                searchMinContrast = 0.75f,
             )
 
         val upscale16BitsMobile =
             ShaderConfig.CUT3(
                 blendMinContrastEdge = 0.10f,
                 blendMaxContrastEdge = 0.50f,
-                softEdgesSharpeningAmount = 0.75f,
                 blendMaxSharpness = 0.75f,
-                edgeMinValue = 0.025f
+                edgeMinValue = 0.025f,
+                searchMinContrast = 0.75f,
             )
 
         val upscale16Bits =
             ShaderConfig.CUT3(
                 blendMinContrastEdge = 0.10f,
                 blendMaxContrastEdge = 0.50f,
-                softEdgesSharpeningAmount = 0.75f,
                 blendMaxSharpness = 0.75f,
-                edgeMinValue = 0.025f
+                edgeMinValue = 0.025f,
+                searchMinContrast = 0.75f,
             )
 
         val upscale32Bits =
             ShaderConfig.CUT3(
                 blendMinContrastEdge = 0.10f,
                 blendMaxContrastEdge = 0.50f,
-                softEdgesSharpeningAmount = 0.75f,
                 blendMaxSharpness = 0.75f,
-                edgeMinValue = 0.025f
+                edgeMinValue = 0.025f,
+                searchMinContrast = 0.75f,
             )
 
         val modern =
             ShaderConfig.CUT3(
                 blendMinContrastEdge = 0.10f,
                 blendMaxContrastEdge = 0.50f,
-                softEdgesSharpeningAmount = 0.75f,
                 blendMaxSharpness = 0.75f,
-                edgeMinValue = 0.025f
+                edgeMinValue = 0.025f,
+                searchMinContrast = 0.75f,
             )
 
         return getConfigForSystem(

diff --git a/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/utils/android/settings/Components.kt b/lemuroid-app/src/main/java/com/swordfish/lemuroid/app/utils/android/settings/Components.kt
@@ -141,6 +141,7 @@ fun LemuroidSettingsSlider(
         headlineColor = defaultColors.disabledHeadlineColor,
         leadingIconColor = defaultColors.disabledLeadingIconColor,
         trailingIconColor = defaultColors.disabledTrailingIconColor,
+        supportingColor = defaultColors.supportingTextColor.copy(alpha = 0.3f)
     )
 
     SettingsSlider(