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

Experimental fix to allow for JDWP connections with different ID sizes

Browse Source
This commit is contained in:
baldurk
2018-04-25 19:07:34 +01:00
parent 460ab48645
commit becfe157b4
4 changed files with 192 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/jdwp_connection.cpp
+46 -10
View File
@@ -123,25 +123,61 @@ void Connection::SetupIDSizes()
.Read(frameIDSize)
.Done();
// we only support sizes that are all the same
if(fieldIDSize != methodIDSize || fieldIDSize != objectIDSize ||
fieldIDSize != referenceTypeIDSize || fieldIDSize != frameIDSize)
if(objectIDSize != referenceTypeIDSize)
{
RDCLOG("Field ID sizes (%d %d %d %d %d) are not the same. Unsupported!", fieldIDSize,
methodIDSize, objectIDSize, referenceTypeIDSize, frameIDSize);
error = true;
return;
RDCWARN("objectID (%d) is not the same size as referenceTypeID (%d). Could cause problems!",
objectIDSize, referenceTypeIDSize);
}
// we also only support 4 or 8 bytes
// we only support 4 or 8 bytes
if(fieldIDSize != 4 && fieldIDSize != 8)
{
RDCLOG("Field ID size %d is unsupported!", fieldIDSize);
RDCLOG("fieldID size %d is unsupported!", fieldIDSize);
error = true;
return;
}
objectID::setSize(fieldIDSize);
fieldID::setSize(fieldIDSize);
// we only support 4 or 8 bytes
if(methodIDSize != 4 && methodIDSize != 8)
{
RDCLOG("methodID size %d is unsupported!", methodIDSize);
error = true;
return;
}
methodID::setSize(methodIDSize);
// we only support 4 or 8 bytes
if(objectIDSize != 4 && objectIDSize != 8)
{
RDCLOG("objectID size %d is unsupported!", objectIDSize);
error = true;
return;
}
objectID::setSize(objectIDSize);
// we only support 4 or 8 bytes
if(referenceTypeIDSize != 4 && referenceTypeIDSize != 8)
{
RDCLOG("referenceTypeID size %d is unsupported!", referenceTypeIDSize);
error = true;
return;
}
referenceTypeID::setSize(referenceTypeIDSize);
// we only support 4 or 8 bytes
if(frameIDSize != 4 && frameIDSize != 8)
{
RDCLOG("frameID size %d is unsupported!", frameIDSize);
error = true;
return;
}
frameID::setSize(frameIDSize);
}
void Connection::Suspend()