From 9b43ab3b209c4f0a74e8b7b68c44402406db9c55 Mon Sep 17 00:00:00 2001 From: kleidis Date: Thu, 13 Nov 2025 15:39:31 +0100 Subject: [PATCH] reformat --- .../fragments/SystemInfoDialogFragment.kt | 2 +- src/android/app/src/main/jni/native.cpp | 26 ++++++++++++------- .../app/src/main/res/values/strings.xml | 1 + 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SystemInfoDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SystemInfoDialogFragment.kt index be950881be..5c914eeb16 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SystemInfoDialogFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SystemInfoDialogFragment.kt @@ -51,7 +51,7 @@ class SystemInfoDialogFragment : DialogFragment() { appendLine("=== ${getString(R.string.cpu_info)} ===") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && Build.SOC_MODEL.isNotBlank()) { - appendLine("${getString(R.string.cpu)}: ${Build.SOC_MODEL}") + appendLine("${getString(R.string.soc)} ${Build.SOC_MODEL}") } val cpuSummary = NativeLibrary.getCpuSummary() diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 707bec53c3..394a3daab3 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -955,7 +955,7 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuSummary(JNIEnv* env, jobject cluster_str += fmt::format("{}x{}", sorted_parts[i].second, sorted_parts[i].first); } - fmt::format_to(std::back_inserter(result), "ARM {} | {} Threads", + fmt::format_to(std::back_inserter(result), "CPUs: {}\n{} Threads", cluster_str, thread_count); f = std::fopen(CPUINFO_PATH, "r"); @@ -990,24 +990,32 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuSummary(JNIEnv* env, jobject bool has_bf16 = feature_set.count("bf16"); bool has_atomics = feature_set.count("atomics") || feature_set.count("lse"); + std::string features; if (has_neon || has_fp) { - result += " | NEON"; - if (has_dotprod) result += "+DP"; - if (has_i8mm) result += "+I8MM"; - if (has_bf16) result += "+BF16"; + features += "NEON"; + if (has_dotprod) features += "+DP"; + if (has_i8mm) features += "+I8MM"; + if (has_bf16) features += "+BF16"; } if (has_sve) { - result += " | SVE"; - if (has_sve2) result += "2"; + if (!features.empty()) features += " | "; + features += "SVE"; + if (has_sve2) features += "2"; } if (has_crypto) { - result += " | Crypto"; + if (!features.empty()) features += " | "; + features += "Crypto"; } if (has_atomics) { - result += " | LSE"; + if (!features.empty()) features += " | "; + features += "LSE"; + } + + if (!features.empty()) { + result += "\nFeatures: " + features; } } diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index b4922b0c21..60c21a196d 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -316,6 +316,7 @@ Error getting emulator info Memory Information Total Memory + SOC: Help Warning