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

Fix injecting on Android 9

Browse Source 
Names aren't returned in GetLocalVariable and slots don't start at 0.
This commit is contained in:
Charlie Birks
2019-10-09 17:47:33 +01:00
committed by Baldur Karlsson
parent ec236b4ff3
commit c4363e615c
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/jdwp.cpp
+9
View File
@@ -216,6 +216,15 @@ bool InjectLibraries(const std::string &deviceID, Network::Socket *sock)
int32_t slotIdx =
conn.GetLocalVariable(vulkanLoaderClass, vulkanLoaderMethod, "librarySearchPath");
// Android 9 doesn't return names and changed how slots are indexed, try an offset from this
if(slotIdx == -1)
{
slotIdx = conn.GetLocalVariable(vulkanLoaderClass, vulkanLoaderMethod, "this");
if(slotIdx != -1)
slotIdx += 4;
}
// as a default, use the 4th slot as it's the 4th argument argument (0 is this), if symbols
// weren't available we can't identify the variable by name
if(slotIdx == -1)