summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZephyron <zephyron@citron-emu.org>2025-01-17 15:16:15 +1000
committerZephyron <zephyron@citron-emu.org>2025-01-17 15:16:15 +1000
commit62de5aa9def7e8617b5c390fdce5f9a71d34df6a (patch)
tree891275d3531c19e7ec5b4ed35fd5eef57ad0eb3b /src
parent43170513b6f28a81c14b4ff4a4f45b0aff739197 (diff)
Downgrade Android SDK and build tools
- Reduce compileSdkVersion and targetSdk from 35 to 34 - Change NDK version to 26.1.10909125 - Downgrade Android Gradle Plugin from 8.8.0 to 8.1.2 - Add androidx.constraintlayout dependency These changes improve compatibility with current Android development environment and add necessary layout support.
Diffstat (limited to 'src')
-rw-r--r--src/android/app/build.gradle.kts7
-rw-r--r--src/android/build.gradle.kts4
-rw-r--r--src/shader_recompiler/frontend/ir/ir_emitter.cpp3
3 files changed, 7 insertions, 7 deletions
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index 1c740013e..62299c538 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -27,8 +27,8 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn
android {
namespace = "org.citron.citron_emu"
- compileSdkVersion = "android-35"
- ndkVersion = "27.2.12479018" // "28.0.12433566 rc1"// "28.0.12674087 rc2" // "26.1.10909125"
+ compileSdkVersion = "android-34"
+ ndkVersion = "26.1.10909125" // "27.2.12479018" // "28.0.12433566 rc1"// "28.0.12674087 rc2" // "26.1.10909125"
buildFeatures {
viewBinding = true
@@ -56,7 +56,7 @@ android {
// TODO If this is ever modified, change application_id in strings.xml
applicationId = "org.citron.citron_emu"
minSdk = 30
- targetSdk = 35
+ targetSdk = 34
versionName = getGitVersion()
versionCode = if (System.getenv("AUTO_VERSIONED") == "true") {
@@ -238,6 +238,7 @@ dependencies {
implementation("io.coil-kt:coil:2.2.2")
implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.window:window:1.2.0-beta03")
+ implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("androidx.navigation:navigation-fragment-ktx:2.7.4")
implementation("androidx.navigation:navigation-ui-ktx:2.7.4")
diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts
index b5ebbf59d..b77906ed6 100644
--- a/src/android/build.gradle.kts
+++ b/src/android/build.gradle.kts
@@ -3,8 +3,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id("com.android.application") version "8.8.0" apply false
- id("com.android.library") version "8.8.0" apply false
+ id("com.android.application") version "8.1.2" apply false
+ id("com.android.library") version "8.1.2" apply false
id("org.jetbrains.kotlin.android") version "1.9.20" apply false
}
diff --git a/src/shader_recompiler/frontend/ir/ir_emitter.cpp b/src/shader_recompiler/frontend/ir/ir_emitter.cpp
index 49171c470..b8bc5ea95 100644
--- a/src/shader_recompiler/frontend/ir/ir_emitter.cpp
+++ b/src/shader_recompiler/frontend/ir/ir_emitter.cpp
@@ -261,8 +261,7 @@ static U1 GetFlowTest(IREmitter& ir, FlowTest flow_test) {
case FlowTest::RGT:
return ir.LogicalAnd(ir.LogicalNot(ir.GetSFlag()), ir.LogicalNot(ir.GetZFlag()));
case FlowTest::FCSM_TR:
- LOG_WARNING(Shader, "(STUBBED) FCSM_TR");
- return ir.Imm1(false);
+ return ir.LogicalAnd(ir.GetSFlag(), ir.LogicalNot(ir.GetZFlag()));
case FlowTest::CSM_TA:
case FlowTest::CSM_TR:
case FlowTest::CSM_MX: