lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-31 20:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fall back to device preferred ABI if package has none. Closes #1944

Browse Source
This commit is contained in:
baldurk
2020-06-18 17:22:02 +01:00
parent 71e749aba5
commit 4c8c16d95f
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android.cpp
+21 -1
View File
@@ -1176,7 +1176,27 @@ ExecuteResult AndroidRemoteServer::ExecuteAndInject(const char *a, const char *w
// set up environment variables for the package, and point to ourselves for vulkan and GLES
// layers
rdcstr installedABI = Android::DetermineInstalledABI(m_deviceID, packageName);
rdcstr layerPackage = GetRenderDocPackageForABI(Android::GetABI(installedABI));
Android::ABI abi = Android::ABI::unknown;
if(installedABI == "null" || installedABI.empty())
{
RDCLOG("Can't determine installed ABI, falling back to device preferred ABI");
// pick the last ABI
rdcarray<Android::ABI> abis = Android::GetSupportedABIs(m_deviceID);
if(abis.empty())
RDCWARN("No ABIs listed as supported");
else
abi = abis.back();
}
else
{
abi = Android::GetABI(installedABI);
}
rdcstr layerPackage = GetRenderDocPackageForABI(abi);
Android::adbExecCommand(m_deviceID, "shell settings put global enable_gpu_debug_layers 1");
Android::adbExecCommand(m_deviceID, "shell settings put global gpu_debug_app " + packageName);
Android::adbExecCommand(m_deviceID,