mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-05 01:20:42 +00:00
Rename replay host to remote server, consistently.
This commit is contained in:
@@ -575,9 +575,9 @@ RENDERDOC_EnumerateRemoteConnections(const char *host, uint32_t nextIdent);
|
||||
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,
|
||||
uint32_t port,
|
||||
volatile bool32 *killReplay);
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_BecomeRemoteServer(const char *listenhost,
|
||||
uint32_t port,
|
||||
volatile bool32 *killReplay);
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// Injection/execution capture functions.
|
||||
|
||||
@@ -191,7 +191,7 @@ public:
|
||||
bool IsReplayApp() const { return m_Replay; }
|
||||
const string &GetConfigSetting(string name) { return m_ConfigSettings[name]; }
|
||||
void SetConfigSetting(string name, string value) { m_ConfigSettings[name] = value; }
|
||||
void BecomeReplayHost(const char *listenhost, uint16_t port, volatile uint32_t &killReplay);
|
||||
void BecomeRemoteServer(const char *listenhost, uint16_t port, volatile uint32_t &killReplay);
|
||||
|
||||
void SetCaptureOptions(const CaptureOptions &opts);
|
||||
const CaptureOptions &GetCaptureOptions() const { return m_Options; }
|
||||
|
||||
@@ -70,7 +70,7 @@ static void ProgressTicker(void *d)
|
||||
}
|
||||
}
|
||||
|
||||
void RenderDoc::BecomeReplayHost(const char *listenhost, uint16_t port, volatile bool32 &killReplay)
|
||||
void RenderDoc::BecomeRemoteServer(const char *listenhost, uint16_t port, volatile bool32 &killReplay)
|
||||
{
|
||||
Network::Socket *sock = Network::CreateServerSocket(listenhost, port, 1);
|
||||
|
||||
|
||||
@@ -459,9 +459,9 @@ extern "C" RENDERDOC_API uint32_t RENDERDOC_CC RENDERDOC_GetDefaultReplayHostPor
|
||||
return RenderDoc_ReplayNetworkPort;
|
||||
}
|
||||
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_SpawnReplayHost(const char *listenhost,
|
||||
uint32_t port,
|
||||
volatile bool32 *killReplay)
|
||||
extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_BecomeRemoteServer(const char *listenhost,
|
||||
uint32_t port,
|
||||
volatile bool32 *killReplay)
|
||||
{
|
||||
bool32 dummy = false;
|
||||
|
||||
@@ -474,5 +474,5 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_SpawnReplayHost(const char
|
||||
if(port == 0)
|
||||
port = RENDERDOC_GetDefaultReplayHostPort();
|
||||
|
||||
RenderDoc::Inst().BecomeReplayHost(listenhost, (uint16_t)port, *killReplay);
|
||||
RenderDoc::Inst().BecomeRemoteServer(listenhost, (uint16_t)port, *killReplay);
|
||||
}
|
||||
|
||||
@@ -386,7 +386,7 @@ struct InjectCommand : public Command
|
||||
}
|
||||
};
|
||||
|
||||
struct ReplayHostCommand : public Command
|
||||
struct RemoteServerCommand : public Command
|
||||
{
|
||||
virtual void AddOptions(cmdline::parser &parser)
|
||||
{
|
||||
@@ -411,7 +411,7 @@ struct ReplayHostCommand : public Command
|
||||
|
||||
usingKillSignal = true;
|
||||
|
||||
RENDERDOC_SpawnReplayHost(host.empty() ? NULL : host.c_str(), port, &killSignal);
|
||||
RENDERDOC_BecomeRemoteServer(host.empty() ? NULL : host.c_str(), port, &killSignal);
|
||||
|
||||
std::cerr << std::endl << "Cleaning up from replay hosting." << std::endl;
|
||||
|
||||
@@ -539,7 +539,7 @@ int renderdoccmd(std::vector<std::string> &argv)
|
||||
add_command("thumb", new ThumbCommand());
|
||||
add_command("capture", new CaptureCommand());
|
||||
add_command("inject", new InjectCommand());
|
||||
add_command("replayhost", new ReplayHostCommand());
|
||||
add_command("remoteserver", new RemoteServerCommand());
|
||||
add_command("replay", new ReplayCommand());
|
||||
add_command("cap32for64", new Cap32For64Command());
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace renderdoc
|
||||
private static extern void RENDERDOC_GetDefaultCaptureOptions(IntPtr outopts);
|
||||
|
||||
[DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
|
||||
private static extern void RENDERDOC_SpawnReplayHost(IntPtr host, UInt32 port, ref bool killReplay);
|
||||
private static extern void RENDERDOC_BecomeRemoteServer(IntPtr host, UInt32 port, ref bool killReplay);
|
||||
|
||||
[DllImport("renderdoc.dll", CharSet = CharSet.Unicode, CallingConvention = CallingConvention.Cdecl)]
|
||||
private static extern void RENDERDOC_TriggerExceptionHandler(IntPtr exceptionPtrs, bool crashed);
|
||||
@@ -222,11 +222,11 @@ namespace renderdoc
|
||||
return new RemoteRenderer(rendPtr);
|
||||
}
|
||||
|
||||
public static void SpawnReplayHost(string host, uint port, ref bool killReplay)
|
||||
public static void BecomeRemoteServer(string host, uint port, ref bool killReplay)
|
||||
{
|
||||
IntPtr host_mem = CustomMarshal.MakeUTF8String(host);
|
||||
|
||||
RENDERDOC_SpawnReplayHost(host_mem, port, ref killReplay);
|
||||
RENDERDOC_BecomeRemoteServer(host_mem, port, ref killReplay);
|
||||
|
||||
CustomMarshal.Free(host_mem);
|
||||
}
|
||||
|
||||
@@ -1498,7 +1498,7 @@ namespace renderdocui.Windows
|
||||
|
||||
Thread thread = Helpers.NewThread(new ThreadStart(() =>
|
||||
{
|
||||
StaticExports.SpawnReplayHost("", 0, ref killReplay);
|
||||
StaticExports.BecomeRemoteServer("", 0, ref killReplay);
|
||||
}));
|
||||
|
||||
thread.Start();
|
||||
|
||||
Reference in New Issue
Block a user