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

Add offset to Android network ports, to differentiate from localhost.

Browse Source 
This requires adb forward to include the offset, for example:
adb forward tcp:38970 tcp:38920
adb forward tcp:39970 tcp:39920
This commit is contained in:
Michael Rennie committed 2016-09-15 13:42:05 +01:00
1 parent 6521a6b782
commit ab71450fb0
3 files changed
+20 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

renderdoc/replay/entry_points.cpp
+13 -8
View File
@@ -477,13 +477,6 @@ extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_EnumerateRemoteTargets(
if(host != NULL && host[0] != '\0')
s = host;
if(host != NULL && !strncmp(host, "adb:", 4))
{
s = "127.0.0.1";
// could parse out an (optional) device name from host+4 here.
}
// initial case is we're called with 0, start with the first port.
// otherwise we're called with the last successful ident, so increment
// before continuing to enumerate.
@@ -492,7 +485,19 @@ extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_EnumerateRemoteTargets(
else
nextIdent++;
for(; nextIdent <= RenderDoc_LastTargetControlPort; nextIdent++)
uint32_t lastIdent = RenderDoc_LastTargetControlPort;
if(host != NULL && !strncmp(host, "adb:", 4))
{
if(nextIdent == RenderDoc_FirstTargetControlPort)
nextIdent += RenderDoc_AndroidPortOffset;
lastIdent += RenderDoc_AndroidPortOffset;
s = "127.0.0.1";
// could parse out an (optional) device name from host+4 here.
}
for(; nextIdent <= lastIdent; nextIdent++)
{
Network::Socket *sock = Network::CreateClientSocket(s.c_str(), (uint16_t)nextIdent, 250);