Merge pull request hrydgard#21124 from hrydgard/more-android

Increase the debugsymbollevel on Android

Author: hrydgard

Core/HLE/sceUtility.cpp

@@ -1182,10 +1182,26 @@ static int sceUtilityGamedataInstallAbort() {
 	return hleLogDebug(Log::sceUtility, gamedataInstallDialog->Abort());
 }
 
+static const char *SystemParamToString(int param) {
+	switch (param) {
+	case PSP_SYSTEMPARAM_ID_STRING_NICKNAME: return "STRING_NICKNAME";
+	case PSP_SYSTEMPARAM_ID_INT_ADHOC_CHANNEL: return "INT_ADHOC_CHANNEL";
+	case PSP_SYSTEMPARAM_ID_INT_WLAN_POWERSAVE: return "INT_WLAN_POWERSAVE";
+	case PSP_SYSTEMPARAM_ID_INT_DATE_FORMAT: return "INT_DATE_FORMAT";
+	case PSP_SYSTEMPARAM_ID_INT_TIME_FORMAT: return "INT_TIME_FORMAT";
+	case PSP_SYSTEMPARAM_ID_INT_TIMEZONE: return "INT_TIMEZONE";
+	case PSP_SYSTEMPARAM_ID_INT_DAYLIGHTSAVINGS: return "INT_DAYLIGHTSAVINGS";
+	case PSP_SYSTEMPARAM_ID_INT_LANGUAGE: return "INT_LANGUAGE";
+	case PSP_SYSTEMPARAM_ID_INT_BUTTON_PREFERENCE: return "INT_BUTTON_PREFERENCE";
+	case PSP_SYSTEMPARAM_ID_INT_LOCK_PARENTAL_LEVEL: return "INT_LOCK_PARENTAL_LEVEL";
+	default: return "N/A";
+	}
+}
+
 //TODO: should save to config file
 static u32 sceUtilitySetSystemParamString(u32 id, u32 strPtr)
 {
-	WARN_LOG_REPORT(Log::sceUtility, "sceUtilitySetSystemParamString(%i, %08x)", id, strPtr);
+	WARN_LOG_REPORT(Log::sceUtility, "sceUtilitySetSystemParamString(%s, %08x)", SystemParamToString(id), strPtr);
 	return 0;
 }
 
@@ -1194,7 +1210,6 @@ static u32 sceUtilityGetSystemParamString(u32 id, u32 destAddr, int destSize) {
 		// TODO: What error code?
 		return hleLogError(Log::sceUtility, -1);
 	}
-	DEBUG_LOG(Log::sceUtility, "sceUtilityGetSystemParamString(%i, %08x, %i)", id, destAddr, destSize);
 	char *buf = (char *)Memory::GetPointerWriteUnchecked(destAddr);
 	switch (id) {
 	case PSP_SYSTEMPARAM_ID_STRING_NICKNAME:
@@ -1209,7 +1224,7 @@ static u32 sceUtilityGetSystemParamString(u32 id, u32 destAddr, int destSize) {
 		return hleLogError(Log::sceUtility, SCE_ERROR_UTILITY_INVALID_SYSTEM_PARAM_ID);
 	}
 
-	return hleLogDebug(Log::sceUtility, 0);
+	return hleLogDebug(Log::sceUtility, 0, "(%s)", SystemParamToString(id));
 }
 
 static u32 sceUtilitySetSystemParamInt(u32 id, u32 value) {
@@ -1226,7 +1241,7 @@ static u32 sceUtilitySetSystemParamInt(u32 id, u32 value) {
 		// PSP can only set above int parameters
 		return hleLogError(Log::sceUtility, SCE_ERROR_UTILITY_INVALID_SYSTEM_PARAM_ID);
 	}
-	return hleLogDebug(Log::sceUtility, 0);
+	return hleLogDebug(Log::sceUtility, 0, "(%s)", SystemParamToString(id));
 }
 
 static u32 sceUtilityGetSystemParamInt(u32 id, u32 destaddr) {
@@ -1281,7 +1296,7 @@ static u32 sceUtilityGetSystemParamInt(u32 id, u32 destaddr) {
 	}
 
 	Memory::Write_U32(param, destaddr);
-	return hleLogInfo(Log::sceUtility, 0, "param: %08x", param);
+	return hleLogInfo(Log::sceUtility, 0, "(%s): %08x", SystemParamToString(id), param);
 }
 
 static u32 sceUtilityLoadNetModule(u32 module) {

UI/EmuScreen.cpp

@@ -1659,7 +1659,8 @@ ScreenRenderFlags EmuScreen::render(ScreenRenderMode mode) {
 
 		Draw::BackendState state = draw->GetCurrentBackendState();
 		if (state.valid) {
-			_dbg_assert_msg_(state.passes >= 1, "skipB: %d sw: %d mode: %d back: %d tag: %s behi: %d", (int)skipBufferEffects, (int)g_Config.bSoftwareRendering, (int)mode, (int)g_Config.iGPUBackend, screenManager()->topScreen()->tag(), (int)g_Config.bRunBehindPauseMenu);
+			// The below can trigger when switching from skip-buffer-effects. We don't really care anymore...
+			// _dbg_assert_msg_(state.passes >= 1, "skipB: %d sw: %d mode: %d back: %d tag: %s behi: %d", (int)skipBufferEffects, (int)g_Config.bSoftwareRendering, (int)mode, (int)g_Config.iGPUBackend, screenManager()->topScreen()->tag(), (int)g_Config.bRunBehindPauseMenu);
 			// Workaround any remaining bugs like this.
 			if (state.passes == 0) {
 				draw->BindFramebufferAsRenderTarget(nullptr, { RPAction::CLEAR, RPAction::CLEAR, RPAction::CLEAR, }, "EmuScreen_SafeFallback");

android/build.gradle.kts

@@ -160,6 +160,7 @@ android {
 			}
 			ndk {
 				abiFilters.addAll(listOf("armeabi-v7a", "arm64-v8a", "x86_64"))
+				debugSymbolLevel = "FULL"
 			}
 		}
 		create("gold") {
@@ -179,6 +180,7 @@ android {
 			}
 			ndk {
 				abiFilters.addAll(listOf("armeabi-v7a", "arm64-v8a", "x86_64"))
+				debugSymbolLevel = "FULL"
 			}
 		}
 		create("legacy") {
@@ -199,6 +201,7 @@ android {
 			}
 			ndk {
 				abiFilters.addAll(listOf("armeabi-v7a", "arm64-v8a"))
+				debugSymbolLevel = "FULL"
 			}
 		}
 		create("vr") {