VERY experimental Nintendo Switch 2 emulator
C++
android: Add current driver vendor to FPS overlay
t8951533fbce5160
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.ktindex c408485c62..5b9f553f7c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt@@ -303,6 +303,11 @@ object NativeLibrary {*/external fun getCpuBackend(): String+ /**+ * Returns the current GPU Driver.+ */+ external fun getGpuDriver(): String+external fun applySettings()external fun logSettings()diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.ktindex 2a97ae14da..82f8e3b505 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt@@ -485,12 +485,15 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {val FRAMETIME = 2val SPEED = 3perfStatsUpdater = {- if (emulationViewModel.emulationStarted.value) {+ if (emulationViewModel.emulationStarted.value &&+ !emulationViewModel.isEmulationStopping.value+ ) {val perfStats = NativeLibrary.getPerfStats()val cpuBackend = NativeLibrary.getCpuBackend()+ val gpuDriver = NativeLibrary.getGpuDriver()if (_binding != null) {binding.showFpsText.text =- String.format("FPS: %.1f\n%s", perfStats[FPS], cpuBackend)+ String.format("FPS: %.1f\n%s/%s", perfStats[FPS], cpuBackend, gpuDriver)}perfStatsUpdateHandler.postDelayed(perfStatsUpdater!!, 800)}diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cppindex 963f573802..c6c55b20c1 100644--- a/src/android/app/src/main/jni/native.cpp+++ b/src/android/app/src/main/jni/native.cpp@@ -674,6 +674,11 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCpuBackend(JNIEnv* env, jclassreturn ToJString(env, "JIT");}+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGpuDriver(JNIEnv* env, jobject jobj) {+ return ToJString(env,+ EmulationSession::GetInstance().System().GPU().Renderer().GetDeviceVendor());+}+void Java_org_yuzu_yuzu_1emu_NativeLibrary_applySettings(JNIEnv* env, jobject jobj) {EmulationSession::GetInstance().System().ApplySettings();}