lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an abstracted interface around android-specific handling

Browse Source 
* This makes it easier to use the same kind of interface to manage other kinds
  of devices.
This commit is contained in:
baldurk
2019-07-29 16:54:36 +01:00
parent 06f2e61b8f
commit e2704fa2eb
34 changed files with 2340 additions and 1492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoccmd/renderdoccmd.cpp
+8 -15
View File
@@ -461,8 +461,6 @@ struct RemoteServerCommand : public Command
parser.add("daemon", 'd', "Go into the background.");
parser.add<std::string>(
"host", 'h', "The interface to listen on. By default listens on all interfaces", false, "");
parser.add<uint32_t>("port", 'p', "The port to listen on.", false,
RENDERDOC_GetDefaultRemoteServerPort());
parser.add("preview", 'v', "Display a preview window when a replay is active.");
}
virtual const char *Description()
@@ -474,12 +472,11 @@ struct RemoteServerCommand : public Command
virtual int Execute(cmdline::parser &parser, const CaptureOptions &)
{
std::string host = parser.get<std::string>("host");
uint32_t port = parser.get<uint32_t>("port");
RENDERDOC_InitGlobalEnv(m_Env, convertArgs(parser.rest()));
std::cerr << "Spawning a replay host listening on " << (host.empty() ? "*" : host) << ":"
<< port << "..." << std::endl;
std::cerr << "Spawning a replay host listening on " << (host.empty() ? "*" : host) << "..."
<< std::endl;
if(parser.exist("daemon"))
{
@@ -500,8 +497,8 @@ struct RemoteServerCommand : public Command
if(DisplayRemoteServerPreview(false, {}).system != WindowingSystem::Unknown)
previewWindow = &DisplayRemoteServerPreview;
RENDERDOC_BecomeRemoteServer(host.empty() ? NULL : host.c_str(), port,
[]() { return killSignal; }, previewWindow);
RENDERDOC_BecomeRemoteServer(host.empty() ? NULL : host.c_str(), []() { return killSignal; },
previewWindow);
std::cerr << std::endl << "Cleaning up from replay hosting." << std::endl;
@@ -522,8 +519,6 @@ struct ReplayCommand : public Command
parser.add<std::string>("remote-host", 0,
"Instead of replaying locally, replay on this host over the network.",
false);
parser.add<uint32_t>("remote-port", 0, "If --remote-host is set, use this port.", false,
RENDERDOC_GetDefaultRemoteServerPort());
}
virtual const char *Description()
{
@@ -551,18 +546,16 @@ struct ReplayCommand : public Command
if(parser.exist("remote-host"))
{
std::cout << "Replaying '" << filename << "' on " << parser.get<std::string>("remote-host")
<< ":" << parser.get<uint32_t>("remote-port") << "." << std::endl;
<< "." << std::endl;
IRemoteServer *remote = NULL;
ReplayStatus status =
RENDERDOC_CreateRemoteServerConnection(parser.get<std::string>("remote-host").c_str(),
parser.get<uint32_t>("remote-port"), &remote);
ReplayStatus status = RENDERDOC_CreateRemoteServerConnection(
parser.get<std::string>("remote-host").c_str(), &remote);
if(remote == NULL || status != ReplayStatus::Succeeded)
{
std::cerr << "Error: " << ToStr(status) << " - Couldn't connect to "
<< parser.get<std::string>("remote-host") << ":"
<< parser.get<uint32_t>("remote-port") << "." << std::endl;
<< parser.get<std::string>("remote-host") << "." << std::endl;
std::cerr << " Have you run renderdoccmd remoteserver on '"
<< parser.get<std::string>("remote-host") << "'?" << std::endl;
return 1;