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

Add replay command (with optional remote replay)

Browse Source
This commit is contained in:
baldurk
2016-07-12 16:48:57 +02:00
parent 884c201aff
commit ced8a62af6
9 changed files with 104 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/api/replay/renderdoc_replay.h
+1 -1
View File
@@ -513,7 +513,7 @@ extern "C" RENDERDOC_API RemoteAccess *RENDERDOC_CC RENDERDOC_CreateRemoteAccess
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC
RENDERDOC_EnumerateRemoteConnections(const char *host, uint32_t nextIdent);
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_DefaultReplayHostPort();
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_GetDefaultReplayHostPort();
extern "C" RENDERDOC_API ReplayCreateStatus RENDERDOC_CC
RENDERDOC_CreateRemoteReplayConnection(const char *host, uint32_t port, RemoteRenderer **rend);
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_SpawnReplayHost(const char *listenhost,
renderdoc/core/remote_replay.cpp
+1 -1
View File
@@ -439,7 +439,7 @@ RENDERDOC_CreateRemoteReplayConnection(const char *host, uint32_t port, RemoteRe
s = host;
if(port == 0)
port = RENDERDOC_DefaultReplayHostPort();
port = RENDERDOC_GetDefaultReplayHostPort();
Network::Socket *sock = NULL;
renderdoc/replay/entry_points.cpp
+2 -2
View File
@@ -454,7 +454,7 @@ extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_EnumerateRemoteConnecti
return ~0U;
}
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_DefaultReplayHostPort()
extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_GetDefaultReplayHostPort()
{
return RenderDoc_ReplayNetworkPort;
}
@@ -472,7 +472,7 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_SpawnReplayHost(const char
listenhost = "0.0.0.0";
if(port == 0)
port = RENDERDOC_DefaultReplayHostPort();
port = RENDERDOC_GetDefaultReplayHostPort();
RenderDoc::Inst().BecomeReplayHost(listenhost, (uint16_t)port, *killReplay);
}
renderdoccmd/renderdoccmd.cpp
+84 -6
View File
@@ -42,7 +42,7 @@ void readCapOpts(const std::string &str, CaptureOptions *opts)
*(b++) = (byte(str[i * 2 + 0] - 'a') << 4) | byte(str[i * 2 + 1] - 'a');
}
void DisplayRendererPreview(ReplayRenderer *renderer)
void DisplayRendererPreview(ReplayRenderer *renderer, uint32_t width, uint32_t height)
{
if(renderer == NULL)
return;
@@ -66,7 +66,8 @@ void DisplayRendererPreview(ReplayRenderer *renderer)
d.offy = 0.0f;
d.sliceFace = 0;
d.rawoutput = false;
d.lightBackgroundColour = d.darkBackgroundColour = FloatVector(0.0f, 0.0f, 0.0f, 0.0f);
d.lightBackgroundColour = FloatVector(0.81f, 0.81f, 0.81f, 1.0f);
d.darkBackgroundColour = FloatVector(0.57f, 0.57f, 0.57f, 1.0f);
d.Red = d.Green = d.Blue = true;
d.Alpha = false;
@@ -89,7 +90,7 @@ void DisplayRendererPreview(ReplayRenderer *renderer)
d.texid = id;
}
DisplayRendererPreview(renderer, d);
DisplayRendererPreview(renderer, d, width, height);
}
std::map<std::string, Command *> commands;
@@ -389,7 +390,7 @@ struct ReplayHostCommand : public Command
parser.add<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_DefaultReplayHostPort());
RENDERDOC_GetDefaultReplayHostPort());
}
virtual const char *Description()
{
@@ -412,6 +413,84 @@ struct ReplayHostCommand : public Command
}
};
struct ReplayCommand : public Command
{
virtual void AddOptions(cmdline::parser &parser)
{
parser.set_footer("<capture.rdc>");
parser.add<uint32_t>("width", 'w', "The preview window width.", false, 1280);
parser.add<uint32_t>("height", 'h', "The preview window height.", false, 720);
parser.add<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_GetDefaultReplayHostPort());
}
virtual const char *Description()
{
return "Replay the log file and show the backbuffer on a preview window.";
}
virtual bool IsInternalOnly() { return false; }
virtual bool IsCaptureCommand() { return false; }
virtual int Execute(cmdline::parser &parser, const CaptureOptions &)
{
if(parser.rest().empty())
{
std::cerr << "Error: capture command requires a filename to load." << std::endl
<< std::endl
<< parser.usage();
return 0;
}
string filename = parser.rest()[0];
float progress = 0.0f;
RemoteRenderer *remote = NULL;
ReplayRenderer *renderer = NULL;
if(parser.exist("remote-host"))
{
ReplayCreateStatus status = RENDERDOC_CreateRemoteReplayConnection(
parser.get<string>("remote-host").c_str(), parser.get<uint32_t>("remote-port"), &remote);
if(remote == NULL || status != eReplayCreate_Success)
{
std::cerr << "Error: Couldn't connect to " << parser.get<string>("remote-host") << ":"
<< parser.get<uint32_t>("remote-port") << "." << std::endl;
std::cerr << " Have you run renderdoccmd replayhost ?" << std::endl;
return 1;
}
float progress = 0.0f;
ReplayRenderer *renderer = NULL;
status = RemoteRenderer_CreateProxyRenderer(remote, 0, filename.c_str(), &progress, &renderer);
if(status == eReplayCreate_Success)
DisplayRendererPreview(renderer, parser.get<uint32_t>("width"),
parser.get<uint32_t>("height"));
else
std::cerr << "Couldn't load and replay '" << filename << "'." << std::endl;
ReplayRenderer_Shutdown(renderer);
remote->Shutdown();
}
else
{
ReplayCreateStatus status =
RENDERDOC_CreateReplayRenderer(filename.c_str(), &progress, &renderer);
if(status == eReplayCreate_Success)
DisplayRendererPreview(renderer, parser.get<uint32_t>("width"),
parser.get<uint32_t>("height"));
else
std::cerr << "Couldn't load and replay '" << filename << "'." << std::endl;
ReplayRenderer_Shutdown(renderer);
}
return 0;
}
};
int renderdoccmd(std::vector<std::string> &argv)
{
// add basic commands, and common aliases
@@ -427,9 +506,8 @@ int renderdoccmd(std::vector<std::string> &argv)
add_command("capture", new CaptureCommand());
add_command("inject", new InjectCommand());
add_command("replayhost", new ReplayHostCommand());
// add_command("replay", new ReplayCommand());
add_command("replay", new ReplayCommand());
// add_command("cap32for64", new Cap32For64Command());
// add_command("remotereplay", new RemoteReplayCommand());
if(argv.size() <= 1)
{
renderdoccmd/renderdoccmd.h
+2 -1
View File
@@ -56,5 +56,6 @@ int renderdoccmd(std::vector<std::string> &argv);
void readCapOpts(const std::string &str, CaptureOptions *opts);
// these must be defined in platform .cpps
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg);
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg, uint32_t width,
uint32_t height);
std::wstring GetUsername();
renderdoccmd/renderdoccmd_android.cpp
+2 -1
View File
@@ -47,7 +47,8 @@ string GetUsername()
return string("Username");
}
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg)
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg, uint32_t width,
uint32_t height)
{
ANativeWindow *connectionScreenWindow = android_state->window;
renderdoccmd/renderdoccmd_apple.cpp
+2 -1
View File
@@ -39,7 +39,8 @@ string GetUsername()
return string(buf, buf + strlen(buf));
}
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg)
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg, uint32_t width,
uint32_t height)
{
}
renderdoccmd/renderdoccmd_linux.cpp
+3 -2
View File
@@ -42,7 +42,8 @@ string GetUsername()
return string(buf, buf + strlen(buf));
}
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg)
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg, uint32_t width,
uint32_t height)
{
int scr;
@@ -63,7 +64,7 @@ void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg
value_list[1] =
XCB_EVENT_MASK_KEY_RELEASE | XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_STRUCTURE_NOTIFY;
xcb_create_window(connection, XCB_COPY_FROM_PARENT, window, screen->root, 0, 0, 1280, 720, 0,
xcb_create_window(connection, XCB_COPY_FROM_PARENT, window, screen->root, 0, 0, width, height, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT, screen->root_visual, value_mask, value_list);
/* Magic code that will send notification when window is destroyed */
renderdoccmd/renderdoccmd_win32.cpp
+7 -2
View File
@@ -225,10 +225,15 @@ wstring GetUsername()
return username;
}
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg)
void DisplayRendererPreview(ReplayRenderer *renderer, TextureDisplay &displayCfg, uint32_t width,
uint32_t height)
{
RECT wr = {0, 0, width, height};
AdjustWindowRect(&wr, WS_OVERLAPPEDWINDOW, FALSE);
HWND wnd = CreateWindowEx(WS_EX_CLIENTEDGE, L"renderdoccmd", L"renderdoccmd", WS_OVERLAPPEDWINDOW,
CW_USEDEFAULT, CW_USEDEFAULT, 1280, 720, NULL, NULL, hInstance, NULL);
CW_USEDEFAULT, CW_USEDEFAULT, wr.right - wr.left, wr.bottom - wr.top,
NULL, NULL, hInstance, NULL);
if(wnd == NULL)
return;