lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Location is correctly a classID and methoID, not two objectIDs

Browse Source
This commit is contained in:
baldurk
2018-05-04 17:35:53 +01:00
parent 3380379aac
commit 4d004fe484
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/jdwp.cpp
+3 -3
View File
@@ -206,7 +206,7 @@ bool InjectLibraries(const std::string &deviceID, Network::Socket *sock)
Event evData =
conn.WaitForEvent(EventKind::MethodEntry, {{ModifierKind::ClassOnly, vulkanLoaderClass}},
[vulkanLoaderMethod](const Event &evData) {
return evData.MethodEntry.location.methodID == vulkanLoaderMethod;
return evData.MethodEntry.location.meth == vulkanLoaderMethod;
});
// if we successfully hit the event, try to inject
@@ -250,7 +250,7 @@ bool InjectLibraries(const std::string &deviceID, Network::Socket *sock)
{
Event evData = conn.WaitForEvent(EventKind::MethodEntry, {{ModifierKind::ClassOnly, androidApp}},
[appConstruct](const Event &evData) {
return evData.MethodEntry.location.methodID == appConstruct;
return evData.MethodEntry.location.meth == appConstruct;
});
if(evData.eventKind == EventKind::MethodEntry)
@@ -323,7 +323,7 @@ bool InjectLibraries(const std::string &deviceID, Network::Socket *sock)
Event evData = conn.WaitForEvent(
EventKind::MethodEntry, {{ModifierKind::ClassOnly, thisClass.RefType}},
[onCreate](const Event &evData) { return evData.MethodEntry.location.methodID == onCreate; });
[onCreate](const Event &evData) { return evData.MethodEntry.location.meth == onCreate; });
if(evData.eventKind == EventKind::MethodEntry)
thread = evData.MethodEntry.thread;
renderdoc/android/jdwp.h
+2 -2
View File
@@ -314,8 +314,8 @@ struct value
struct Location
{
TypeTag tag;
objectID classID;
objectID methodID;
classID clss;
methodID meth;
uint64_t index;
};
renderdoc/android/jdwp_util.cpp
+4 -4
View File
@@ -202,8 +202,8 @@ template <>
CommandData &CommandData::Read(Location &loc)
{
Read((byte &)loc.tag);
Read(loc.classID);
Read(loc.methodID);
Read(loc.clss);
Read(loc.meth);
Read(loc.index);
return *this;
}
@@ -212,8 +212,8 @@ template <>
CommandData &CommandData::Write(const Location &loc)
{
Write((const byte &)loc.tag);
Write(loc.classID);
Write(loc.methodID);
Write(loc.clss);
Write(loc.meth);
Write(loc.index);
return *this;
}